[OPW,kernel,2/4] Staging: btmtk_usb: Fix incorrect brace placement
diff mbox

Message ID c48a75e9ff6a669c5187e2160bdaecb7c53c2e2e.1381240946.git.rashika.kheria@gmail.com
State Accepted
Headers show

Commit Message

Rashika Oct. 8, 2013, 2:24 p.m. UTC
The patch fixes the following checkpatch.pl warning in btmtk_usb.c
WARNING: braces {} are not necessary for single statement blocks

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
---

This revision fixes the following issues from the previous revision-
Driver Name not mentioned in Subject

 drivers/staging/btmtk_usb/btmtk_usb.c |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

Comments

Zach Brown Oct. 8, 2013, 5:38 p.m. UTC | #1
On Tue, Oct 08, 2013 at 07:54:37PM +0530, Rashika Kheria wrote:
> The patch fixes the following checkpatch.pl warning in btmtk_usb.c
> WARNING: braces {} are not necessary for single statement blocks
> 
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>

Reviewed-by: Zach Brown <zab@redhat.com>
Josh Triplett Oct. 8, 2013, 7:25 p.m. UTC | #2
On Tue, Oct 08, 2013 at 07:54:37PM +0530, Rashika Kheria wrote:
> The patch fixes the following checkpatch.pl warning in btmtk_usb.c
> WARNING: braces {} are not necessary for single statement blocks
> 
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>

Reviewed-by: Josh Triplett <josh@joshtriplett.org>

> ---
> 
> This revision fixes the following issues from the previous revision-
> Driver Name not mentioned in Subject
> 
>  drivers/staging/btmtk_usb/btmtk_usb.c |   12 ++++--------
>  1 file changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/staging/btmtk_usb/btmtk_usb.c b/drivers/staging/btmtk_usb/btmtk_usb.c
> index 2da8466..d8ede3a 100644
> --- a/drivers/staging/btmtk_usb/btmtk_usb.c
> +++ b/drivers/staging/btmtk_usb/btmtk_usb.c
> @@ -249,9 +249,8 @@ static u16 checksume16(u8 *pData, int len)
>  	if (len)
>  		sum += *((u8 *)pData);
>  
> -	while (sum >> 16) {
> +	while (sum >> 16)
>  		sum = (sum & 0xFFFF) + (sum >> 16);
> -	}
>  
>  	return ~sum;
>  }
> @@ -270,9 +269,8 @@ static int btmtk_usb_chk_crc(struct btmtk_usb_data *data, u32 checksum_len)
>  			DEVICE_VENDOR_REQUEST_IN, 0x20, 0x00, data->io_buf,
>  			8, CONTROL_TIMEOUT_JIFFIES);
>  
> -	if (ret < 0) {
> +	if (ret < 0)
>  		BT_ERR("%s error(%d)\n", __func__, ret);
> -	}
>  
>  	return ret;
>  }
> @@ -690,9 +688,8 @@ loadfw_protect:
>  			/* U2M_PDMA descriptor */
>  			btmtk_usb_io_write32(data, 0x230, cur_len);
>  
> -			while ((sent_len % 4) != 0) {
> +			while ((sent_len % 4) != 0)
>  				sent_len++;
> -			}
>  
>  			/* U2M_PDMA length */
>  			btmtk_usb_io_write32(data, 0x234, sent_len << 16);
> @@ -945,9 +942,8 @@ static void btmtk_usb_bulk_in_complete(struct urb *urb)
>  	BT_DBG("%s:%s urb %p status %d count %d", __func__, hdev->name,
>  					urb, urb->status, urb->actual_length);
>  
> -	if (!test_bit(HCI_RUNNING, &hdev->flags)) {
> +	if (!test_bit(HCI_RUNNING, &hdev->flags))
>  		return;
> -	}
>  
>  	if (urb->status == 0) {
>  		hdev->stat.byte_rx += urb->actual_length;
> -- 
> 1.7.9.5
> 
> -- 
> You received this message because you are subscribed to the Google Groups "opw-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to opw-kernel+unsubscribe@googlegroups.com.
> For more options, visit https://groups.google.com/groups/opt_out.
Greg Kroah-Hartman Oct. 11, 2013, 8:15 p.m. UTC | #3
On Tue, Oct 08, 2013 at 07:54:37PM +0530, Rashika Kheria wrote:
> The patch fixes the following checkpatch.pl warning in btmtk_usb.c
> WARNING: braces {} are not necessary for single statement blocks
> 
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>

Applied, thanks.

greg k-h

Patch
diff mbox

diff --git a/drivers/staging/btmtk_usb/btmtk_usb.c b/drivers/staging/btmtk_usb/btmtk_usb.c
index 2da8466..d8ede3a 100644
--- a/drivers/staging/btmtk_usb/btmtk_usb.c
+++ b/drivers/staging/btmtk_usb/btmtk_usb.c
@@ -249,9 +249,8 @@  static u16 checksume16(u8 *pData, int len)
 	if (len)
 		sum += *((u8 *)pData);
 
-	while (sum >> 16) {
+	while (sum >> 16)
 		sum = (sum & 0xFFFF) + (sum >> 16);
-	}
 
 	return ~sum;
 }
@@ -270,9 +269,8 @@  static int btmtk_usb_chk_crc(struct btmtk_usb_data *data, u32 checksum_len)
 			DEVICE_VENDOR_REQUEST_IN, 0x20, 0x00, data->io_buf,
 			8, CONTROL_TIMEOUT_JIFFIES);
 
-	if (ret < 0) {
+	if (ret < 0)
 		BT_ERR("%s error(%d)\n", __func__, ret);
-	}
 
 	return ret;
 }
@@ -690,9 +688,8 @@  loadfw_protect:
 			/* U2M_PDMA descriptor */
 			btmtk_usb_io_write32(data, 0x230, cur_len);
 
-			while ((sent_len % 4) != 0) {
+			while ((sent_len % 4) != 0)
 				sent_len++;
-			}
 
 			/* U2M_PDMA length */
 			btmtk_usb_io_write32(data, 0x234, sent_len << 16);
@@ -945,9 +942,8 @@  static void btmtk_usb_bulk_in_complete(struct urb *urb)
 	BT_DBG("%s:%s urb %p status %d count %d", __func__, hdev->name,
 					urb, urb->status, urb->actual_length);
 
-	if (!test_bit(HCI_RUNNING, &hdev->flags)) {
+	if (!test_bit(HCI_RUNNING, &hdev->flags))
 		return;
-	}
 
 	if (urb->status == 0) {
 		hdev->stat.byte_rx += urb->actual_length;