[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1271365297-26805-1-git-send-email-chihau@gmail.com>
Date: Thu, 15 Apr 2010 17:01:37 -0400
From: Chihau Chau <chihau@...il.com>
To: gregkh@...e.de
Cc: pavel@....cz, devel@...verdev.osuosl.org,
linux-kernel@...r.kernel.org, Chihau Chau <chihau@...il.com>
Subject: [PATCH] Staging: dream: smd: smd_qmi: fix code style issues
From: Chihau Chau <chihau@...il.com>
This fixes some code style issues detected with the checkpatch.pl
script, like not necessary braces {} in some if and else statements and
include a KERN_INFO facility level in a printk() function.
Signed-off-by: Chihau Chau <chihau@...il.com>
---
drivers/staging/dream/smd/smd_qmi.c | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/dream/smd/smd_qmi.c b/drivers/staging/dream/smd/smd_qmi.c
index 9e9067f..76fce51 100644
--- a/drivers/staging/dream/smd/smd_qmi.c
+++ b/drivers/staging/dream/smd/smd_qmi.c
@@ -211,11 +211,10 @@ static int qmi_send(struct qmi_ctxt *ctxt, struct qmi_msg *msg)
qmi_dump_msg(msg, "send");
- if (msg->service == QMI_CTL) {
+ if (msg->service == QMI_CTL)
hlen = QMUX_HEADER - 1;
- } else {
+ else
hlen = QMUX_HEADER;
- }
/* QMUX length is total header + total payload - IFC selector */
len = hlen + msg->size - 1;
@@ -248,11 +247,10 @@ static int qmi_send(struct qmi_ctxt *ctxt, struct qmi_msg *msg)
/* len + 1 takes the interface selector into account */
r = smd_write(ctxt->ch, msg->tlv - hlen, len + 1);
- if (r != len) {
+ if (r != len)
return -1;
- } else {
+ else
return 0;
- }
}
static void qmi_process_ctl_msg(struct qmi_ctxt *ctxt, struct qmi_msg *msg)
@@ -376,7 +374,7 @@ static void qmi_process_broadcast_wds_msg(struct qmi_ctxt *ctxt,
static void qmi_process_wds_msg(struct qmi_ctxt *ctxt,
struct qmi_msg *msg)
{
- printk("wds: %04x @ %02x\n", msg->type, msg->client_id);
+ printk(KERN_INFO "wds: %04x @ %02x\n", msg->type, msg->client_id);
if (msg->client_id == ctxt->wds_client_id) {
qmi_process_unicast_wds_msg(ctxt, msg);
} else if (msg->client_id == 0xff) {
@@ -504,9 +502,8 @@ static void qmi_notify(void *priv, unsigned event)
case SMD_EVENT_DATA: {
int sz;
sz = smd_cur_packet_size(ctxt->ch);
- if ((sz > 0) && (sz <= smd_read_avail(ctxt->ch))) {
+ if ((sz > 0) && (sz <= smd_read_avail(ctxt->ch)))
queue_work(qmi_wq, &ctxt->read_work);
- }
break;
}
case SMD_EVENT_OPEN:
--
1.5.6.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists