[PATCH 1/2] drivers: staging: rts5208: rtsx.c fix Unbalanced braces around else statement issue

[PATCH 1/2] drivers: staging: rts5208: rtsx.c fix Unbalanced braces around else statement issue

[John Oldman]

Fix coding style issue

Signed-off-by: John Oldman <john.oldman@polehill.co.uk>
---
 drivers/staging/rts5208/rtsx.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/rts5208/rtsx.c b/drivers/staging/rts5208/rtsx.c
index be0053c795b7..ca836ca2ee81 100644
--- a/drivers/staging/rts5208/rtsx.c
+++ b/drivers/staging/rts5208/rtsx.c
@@ -419,10 +419,8 @@ static int rtsx_control_thread(void *__dev)
 				chip->srb->device->id,
 				(u8)chip->srb->device->lun);
 			chip->srb->result = DID_BAD_TARGET << 16;
-		}
-
-		/* we've got a command, let's do it! */
-		else {
+		} else {
+			/* we've got a command, let's do it! */
 			scsi_show_command(chip);
 			rtsx_invoke_transport(chip->srb, chip);
 		}
-- 
2.17.1

[PATCH 2/2] drivers: staging: rts5208: rtsx.c fix Unbalanced braces around else-if statements

[John Oldman]

Make a better job of fixing coding style issues, this time fixing
all blocks as per Joe Perches' comment.

Signed-off-by: John Oldman <john.oldman@polehill.co.uk>
---
 drivers/staging/rts5208/rtsx.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/rts5208/rtsx.c b/drivers/staging/rts5208/rtsx.c
index ca836ca2ee81..e16a7b9c3203 100644
--- a/drivers/staging/rts5208/rtsx.c
+++ b/drivers/staging/rts5208/rtsx.c
@@ -402,19 +402,15 @@ static int rtsx_control_thread(void *__dev)
 		if (chip->srb->sc_data_direction == DMA_BIDIRECTIONAL) {
 			dev_err(&dev->pci->dev, "UNKNOWN data direction\n");
 			chip->srb->result = DID_ERROR << 16;
-		}
-
-		/* reject if target != 0 or if LUN is higher than
-		 * the maximum known LUN
-		 */
-		else if (chip->srb->device->id) {
+		} else if (chip->srb->device->id) {
+			/* reject if target != 0 or if LUN is higher than
+			 * the maximum known LUN
+			 */
 			dev_err(&dev->pci->dev, "Bad target number (%d:%d)\n",
 				chip->srb->device->id,
 				(u8)chip->srb->device->lun);
 			chip->srb->result = DID_BAD_TARGET << 16;
-		}
-
-		else if (chip->srb->device->lun > chip->max_lun) {
+		} else if (chip->srb->device->lun > chip->max_lun) {
 			dev_err(&dev->pci->dev, "Bad LUN (%d:%d)\n",
 				chip->srb->device->id,
 				(u8)chip->srb->device->lun);
-- 
2.17.1

Re: [PATCH 2/2] drivers: staging: rts5208: rtsx.c fix Unbalanced braces around else-if statements

[Greg KH]

On Mon, Apr 27, 2020 at 04:24:42PM +0100, John Oldman wrote:
> Make a better job of fixing coding style issues, this time fixing
> all blocks as per Joe Perches' comment.
> 
> Signed-off-by: John Oldman <john.oldman@polehill.co.uk>
> ---
>  drivers/staging/rts5208/rtsx.c | 14 +++++---------
>  1 file changed, 5 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/staging/rts5208/rtsx.c b/drivers/staging/rts5208/rtsx.c
> index ca836ca2ee81..e16a7b9c3203 100644
> --- a/drivers/staging/rts5208/rtsx.c
> +++ b/drivers/staging/rts5208/rtsx.c
> @@ -402,19 +402,15 @@ static int rtsx_control_thread(void *__dev)
>  		if (chip->srb->sc_data_direction == DMA_BIDIRECTIONAL) {
>  			dev_err(&dev->pci->dev, "UNKNOWN data direction\n");
>  			chip->srb->result = DID_ERROR << 16;
> -		}
> -
> -		/* reject if target != 0 or if LUN is higher than
> -		 * the maximum known LUN
> -		 */
> -		else if (chip->srb->device->id) {
> +		} else if (chip->srb->device->id) {
> +			/* reject if target != 0 or if LUN is higher than
> +			 * the maximum known LUN
> +			 */
>  			dev_err(&dev->pci->dev, "Bad target number (%d:%d)\n",
>  				chip->srb->device->id,
>  				(u8)chip->srb->device->lun);
>  			chip->srb->result = DID_BAD_TARGET << 16;
> -		}
> -
> -		else if (chip->srb->device->lun > chip->max_lun) {
> +		} else if (chip->srb->device->lun > chip->max_lun) {
>  			dev_err(&dev->pci->dev, "Bad LUN (%d:%d)\n",
>  				chip->srb->device->id,
>  				(u8)chip->srb->device->lun);
> -- 
> 2.17.1

Why is this not just one patch?

Re: [PATCH 2/2] drivers: staging: rts5208: rtsx.c fix Unbalanced braces around else-if statements

[Joe Perches]

On Mon, 2020-04-27 at 18:04 +0200, Greg KH wrote:
> On Mon, Apr 27, 2020 at 04:24:42PM +0100, John Oldman wrote:
> > Make a better job of fixing coding style issues, this time fixing
> > all blocks as per Joe Perches' comment.
[]
> Why is this not just one patch?

Hi John.

These _should_ be one patch.

The subject line should be versioned and affirmative like:

Subject: [PATCH V2] staging: rts5208: rtsx: Use balanced braces for if/else if blocks

The subject should not include "fix", as this is a coding style
issue and not really a logical defect.

Lastly the "this time fixing" bit should be below the --- line.

cheers, Joe