Skip to contentSkip to conversation

Improve code, codestyle in usb_ops_linux.c

PATCH New Navya Sri Nizamkari 1 participant 3 messages Feb 27, 2015 Staging

lore
Share & tools
lore
#0 lore raw

v2 cover Improve code, codestyle in usb_ops_linux.c

[Changes in v2]
Fix checkpatch.pl warning of line being over 80 characters in the lines where changes are made.

[original cover letter]
This patchset improves the code in usb_ops_linux by removing the use of a variable, adds a blank line after declarations to improve code readability.

Navya Sri Nizamkari (2):
staging: rtl8188eu: Compress two statements into one.
staging: rtl8188eu: Add blank line after declarations

 drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)
Signature · 1 line
1.9.1
#1 lore raw

PATCH v2 1/2 staging: rtl8188eu: Compress two statements into one.

This patch removes the use of a variable used only for returning a value. The following coccinelle script was used to discover it:

@@
expression ret;
identifier f;
@@

-ret =
+return

     f(...);
     -return ret;

It also fixes the checkpatch.pl warning about line being over 80 characters, in the lines where changes were made.

---
Changes in v2:
-Fix checkpatch.pl warnings of 'line over 80 characters'
too where lines are compressed into one.

 drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c +6 -9
index 80e7ef9..b9e1a61 100644
@@ -552,7 +552,6 @@ int usb_write8(struct adapter *adapter, u32 addr, u8 val)
 	u16 index;
 	u16 len;
 	u8 data;
-	int ret;
 
 	request = 0x05;
 	requesttype = 0x00;/* write_out */
@@ -560,8 +559,8 @@ int usb_write8(struct adapter *adapter, u32 addr, u8 val)
 	wvalue = (u16)(addr&0x0000ffff);
 	len = 1;
 	data = val;
-	ret = usbctrl_vendorreq(adapter, request, wvalue, index, &data, len, requesttype);
-	return ret;
+	return usbctrl_vendorreq(adapter, request, wvalue,
+				 index, &data, len, requesttype);
 }
 
 int usb_write16(struct adapter *adapter, u32 addr, u16 val)
@@ -572,7 +571,6 @@ int usb_write16(struct adapter *adapter, u32 addr, u16 val)
 	u16 index;
 	u16 len;
 	__le32 data;
-	int ret;
 
 
 	request = 0x05;
@@ -584,10 +582,10 @@ int usb_write16(struct adapter *adapter, u32 addr, u16 val)
 
 	data = cpu_to_le32(val & 0x0000ffff);
 
-	ret = usbctrl_vendorreq(adapter, request, wvalue, index, &data, len, requesttype);
+	return usbctrl_vendorreq(adapter, request, wvalue,
+				 index, &data, len, requesttype);
 
 
-	return ret;
 }
 
 int usb_write32(struct adapter *adapter, u32 addr, u32 val)
@@ -598,7 +596,6 @@ int usb_write32(struct adapter *adapter, u32 addr, u32 val)
 	u16 index;
 	u16 len;
 	__le32 data;
-	int ret;
 
 
 	request = 0x05;
@@ -609,10 +606,10 @@ int usb_write32(struct adapter *adapter, u32 addr, u32 val)
 	len = 4;
 	data = cpu_to_le32(val);
 
-	ret = usbctrl_vendorreq(adapter, request, wvalue, index, &data, len, requesttype);
+	return usbctrl_vendorreq(adapter, request, wvalue,
+				 index, &data, len, requesttype);
 
 
-	return ret;
 }
 
 static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs)
Signature · 1 line
1.9.1
#2 lore raw

PATCH v2 2/2 staging: rtl8188eu: Add blank line after declarations

In reply to Navya Sri Nizamkari

This patch removes the following checkpatch.pl warning:

WARNING: Missing a blank line after declarations

---
Changes in v2:
-None in this patch of the set.

drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 1 +

 1 file changed, 1 insertion(+)
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c +1 -0
index b9e1a61..7e599bc 100644
@@ -530,6 +530,7 @@ void usb_read_port_cancel(struct adapter *padapter)
 {
 	int i;
 	struct recv_buf *precvbuf;
+
 	precvbuf = (struct recv_buf *)padapter->recvpriv.precv_buf;
 
 	DBG_88E("%s\n", __func__);
Signature · 1 line
1.9.1