Style: Fix some remaining style issues in atmodem

diff --git a/drivers/atmodem/call-volume.c b/drivers/atmodem/call-volume.c
index 6ba45a5..3989450 100644 (file)
--- a/drivers/atmodem/call-volume.c
+++ b/drivers/atmodem/call-volume.c
@@ -180,8 +180,8 @@ error:
        CALLBACK_WITH_FAILURE(cb, data);
 }
 
-static int at_call_volume_probe(struct ofono_call_volume *cv, unsigned int vendor,
-                               void *data)
+static int at_call_volume_probe(struct ofono_call_volume *cv,
+                               unsigned int vendor, void *data)
 {
        GAtChat *chat = data;
        struct cv_data *cvd;

diff --git a/drivers/atmodem/gprs.c b/drivers/atmodem/gprs.c
index 7af66f1..ea2d40c 100644 (file)
--- a/drivers/atmodem/gprs.c
+++ b/drivers/atmodem/gprs.c
@@ -215,7 +215,8 @@ static void gprs_initialized(gboolean ok, GAtResult *result, gpointer user_data)
        struct gprs_data *gd = ofono_gprs_get_data(gprs);
 
        g_at_chat_register(gd->chat, "+CGEV:", cgev_notify, FALSE, gprs, NULL);
-       g_at_chat_register(gd->chat, "+CGREG:", cgreg_notify, FALSE, gprs, NULL);
+       g_at_chat_register(gd->chat, "+CGREG:", cgreg_notify,
+                               FALSE, gprs, NULL);
 
        ofono_gprs_register(gprs);
 }

diff --git a/drivers/atmodem/sms.c b/drivers/atmodem/sms.c
index 237056e..1b1b392 100644 (file)
--- a/drivers/atmodem/sms.c
+++ b/drivers/atmodem/sms.c
@@ -329,7 +329,8 @@ static void at_cmt_notify(GAtResult *result, gpointer user_data)
                return;
        }
 
-       ofono_debug("Got new SMS Deliver PDU via CMT: %s, %d", hexpdu, tpdu_len);
+       ofono_debug("Got new SMS Deliver PDU via CMT: %s, %d",
+                       hexpdu, tpdu_len);
 
        decode_hex_own_buf(hexpdu, -1, &pdu_len, 0, pdu);
        ofono_sms_deliver_notify(sms, pdu, pdu_len, tpdu_len);

diff --git a/drivers/atmodem/ussd.c b/drivers/atmodem/ussd.c
index d1c921b..c0f5b03 100644 (file)
--- a/drivers/atmodem/ussd.c
+++ b/drivers/atmodem/ussd.c
@@ -91,8 +91,7 @@ static void cusd_parse(GAtResult *result, struct ofono_ussd *ussd)
                /* TODO: Figure out what to do with 8 bit data */
                ofono_error("8-bit coded USSD response received");
                status = 4; /* Not supported */
-       }
-       else {
+       } else {
                /* No other encoding is mentioned in TS27007 7.15 */
                ofono_error("Unsupported USSD data coding scheme (%02x)", dcs);
                status = 4; /* Not supported */

diff --git a/drivers/atmodem/voicecall.c b/drivers/atmodem/voicecall.c
index 885cbfa..114cbc7 100644 (file)
--- a/drivers/atmodem/voicecall.c
+++ b/drivers/atmodem/voicecall.c
@@ -131,7 +131,7 @@ static void clcc_poll_cb(gboolean ok, GAtResult *result, gpointer user_data)
        dump_response("clcc_poll_cb", ok, result);
 
        if (!ok) {
-               ofono_error("We are polling CLCC and CLCC resulted in an error");
+               ofono_error("We are polling CLCC and received an error");
                ofono_error("All bets are off for call management");
                return;
        }
@@ -177,7 +177,8 @@ static void clcc_poll_cb(gboolean ok, GAtResult *result, gpointer user_data)
                         */
                        nc->clip_validity = oc->clip_validity;
 
-                       if (memcmp(nc, oc, sizeof(struct ofono_call)) && !nc->type)
+                       if (memcmp(nc, oc, sizeof(struct ofono_call)) &&
+                                       !nc->type)
                                ofono_voicecall_notify(vc, nc);
 
                        n = n->next;
@@ -308,7 +309,7 @@ static void atd_cb(gboolean ok, GAtResult *result, gpointer user_data)
        call = create_call(vc, 0, 0, 2, num, type, validity);
 
        if (!call) {
-               ofono_error("Unable to allocate call, call tracking will fail!");
+               ofono_error("Unable to malloc, call tracking will fail!");
                return;
        }
 
@@ -778,7 +779,7 @@ static void ccwa_notify(GAtResult *result, gpointer user_data)
                                num, num_type, validity);
 
        if (!call) {
-               ofono_error("malloc call structfailed. Call management is fubar");
+               ofono_error("Unable to malloc. Call management is fubar");
                return;
        }