Skip to contentSkip to conversation

Staging: dream: smd: smd_qmi: fix code style issues

PATCH In review Chihau Chau 3 participants 4 messages Mar 15, 2010 – Apr 28, 2010 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: dream: smd: smd_qmi: fix code style issues

From: Chihau Chau <[email protected]>

This fixes some code style issues about to #include <linux/uaccess.h> instead of <asm/uaccess.h> and some not necessary braces {}.

---
 drivers/staging/dream/smd/smd_qmi.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
drivers/staging/dream/smd/smd_qmi.c +3 -4
index 687db14..9e9067f 100644
@@ -25,7 +25,7 @@
 #include <linux/miscdevice.h>
 #include <linux/workqueue.h>
 
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <mach/msm_smd.h>
 
 #define QMI_CTL 0x00
@@ -643,11 +643,10 @@ static int qmi_print_state(struct qmi_ctxt *ctxt, char *buf, int max)
 	}
 
 	i = scnprintf(buf, max, "STATE=%s\n", statename);
-	i += scnprintf(buf + i, max - i, "CID=%d\n",ctxt->wds_client_id);
+	i += scnprintf(buf + i, max - i, "CID=%d\n", ctxt->wds_client_id);
 
-	if (ctxt->state != STATE_ONLINE){
+	if (ctxt->state != STATE_ONLINE)
 		return i;
-	}
 
 	i += scnprintf(buf + i, max - i, "ADDR=%d.%d.%d.%d\n",
 		ctxt->addr[0], ctxt->addr[1], ctxt->addr[2], ctxt->addr[3]);
Signature · 1 line
1.5.6.3
#1 lore raw
Quoted 6 lines · Chihau Chau

From: Chihau Chau <[email protected]>

This fixes some code style issues about to #include <linux/uaccess.h> instead of <asm/uaccess.h> and some not necessary braces {}.

ACK.

Quoted 31 lines
---
 drivers/staging/dream/smd/smd_qmi.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
drivers/staging/dream/smd/smd_qmi.c +3 -4
index 687db14..9e9067f 100644
@@ -25,7 +25,7 @@
 #include <linux/miscdevice.h>
 #include <linux/workqueue.h>
 
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <mach/msm_smd.h>
 
 #define QMI_CTL 0x00
@@ -643,11 +643,10 @@ static int qmi_print_state(struct qmi_ctxt *ctxt, char *buf, int max)
 	}
 
 	i = scnprintf(buf, max, "STATE=%s\n", statename);
-	i += scnprintf(buf + i, max - i, "CID=%d\n",ctxt->wds_client_id);
+	i += scnprintf(buf + i, max - i, "CID=%d\n", ctxt->wds_client_id);
 
-	if (ctxt->state != STATE_ONLINE){
+	if (ctxt->state != STATE_ONLINE)
 		return i;
-	}
 
 	i += scnprintf(buf + i, max - i, "ADDR=%d.%d.%d.%d\n",
 		ctxt->addr[0], ctxt->addr[1], ctxt->addr[2], ctxt->addr[3]);
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#2 lore raw

So, What about this patch? Greg?

2010/3/15 Pavel Machek <[email protected]>:

Quoted 46 lines · Chihau Chau
Quoted 6 lines

From: Chihau Chau <[email protected]>

This fixes some code style issues about to #include <linux/uaccess.h> instead of <asm/uaccess.h> and some not necessary braces {}.

ACK.

Quoted 21 lines

---
 drivers/staging/dream/smd/smd_qmi.c |    7 +++----

 1 files changed, 3 insertions(+), 4 deletions(-)
drivers/staging/dream/smd/smd_qmi.c +1 -1
index 687db14..9e9067f 100644
@@ -25,7 +25,7 @@
  #include <linux/miscdevice.h>
  #include <linux/workqueue.h>
 
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
  #include <mach/msm_smd.h>
 
  #define QMI_CTL 0x00
@@ -643,11 +643,10 @@ static int qmi_print_state(struct qmi_ctxt *ctxt, char *buf, int max)
       }
 
       i = scnprintf(buf, max, "STATE=%s\n", statename);

drivers/staging/dream/smd/smd_qmi.c static int qmi_print_state(struct qmi_ctxt *ctxt, char *buf, int max) · line 652

Quoted 10 lines
drivers/staging/dream/smd/smd_qmi.c +2 -3
-     i += scnprintf(buf + i, max - i, "CID=%d\n",ctxt->wds_client_id);
+     i += scnprintf(buf + i, max - i, "CID=%d\n", ctxt->wds_client_id);
 
-     if (ctxt->state != STATE_ONLINE){
+     if (ctxt->state != STATE_ONLINE)
               return i;
-     }
 
       i += scnprintf(buf + i, max - i, "ADDR=%d.%d.%d.%d\n",
               ctxt->addr[0], ctxt->addr[1], ctxt->addr[2], ctxt->addr[3]);

--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Signature · 1 line
Chihau Chau
#3 lore raw
Quoted 1 line · Chihau Chau

So, What about this patch? Greg?

Now queued up, sorry for the delay.

greg k-h