From e732452eea1f41d5e86e864588e25b98ab872fcd Mon Sep 17 00:00:00 2001 From: Marit Henriksen Date: Fri, 14 Jan 2011 12:18:47 +0100 Subject: stemodem: Removed defaults in switches. Coding style guidline M12. --- drivers/stemodem/voicecall.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'drivers') diff --git a/drivers/stemodem/voicecall.c b/drivers/stemodem/voicecall.c index 423f63ee..58b535ba 100644 --- a/drivers/stemodem/voicecall.c +++ b/drivers/stemodem/voicecall.c @@ -76,7 +76,7 @@ struct change_state_req { }; /* Translate from the ECAV-based STE-status to CLCC based status */ -static int call_status_ste_to_ofono(int status) +static int call_status_ste_to_ofono(enum call_status_ste status) { switch (status) { case STE_CALL_STATUS_IDLE: @@ -95,9 +95,9 @@ static int call_status_ste_to_ofono(int status) return CALL_STATUS_INCOMING; case STE_CALL_STATUS_BUSY: return CALL_STATUS_DISCONNECTED; - default: - return CALL_STATUS_DISCONNECTED; } + + return CALL_STATUS_DISCONNECTED; } static struct ofono_call *create_call(struct ofono_voicecall *vc, int type, @@ -198,22 +198,22 @@ static void ste_dial(struct ofono_voicecall *vc, snprintf(buf, sizeof(buf), "ATD%s", ph->number); switch (clir) { + case OFONO_CLIR_OPTION_DEFAULT: + break; case OFONO_CLIR_OPTION_INVOCATION: strcat(buf, "I"); break; case OFONO_CLIR_OPTION_SUPPRESSION: strcat(buf, "i"); break; - default: - break; } switch (cug) { + case OFONO_CUG_OPTION_DEFAULT: + break; case OFONO_CUG_OPTION_INVOCATION: strcat(buf, "G"); break; - default: - break; } strcat(buf, ";"); @@ -526,9 +526,6 @@ static void ecav_notify(GAtResult *result, gpointer user_data) existing_call->status = status; ofono_voicecall_notify(vc, existing_call); break; - - default: - break; } } -- cgit v1.2.3