staging: rts5208: merge unnecessary split line

Message ID Y0550VcHI8NzFzzf@elroy-temp-vm.gaiao0uenmiufjlowqgp5yxwdh.gvxx.internal.cloudapp.net
State New
Headers
Series staging: rts5208: merge unnecessary split line |

Commit Message

Tanjuate Brunostar Oct. 18, 2022, 10:02 a.m. UTC
  Fix checkpatch warning by merging unnecessary split line in order to
avoid ending a line of code with a "(". The resulting code does
not affect readability and is well within the code-style guidelines

Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com>
---
 drivers/staging/rts5208/sd.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
  

Comments

Julia Lawall Oct. 18, 2022, 10:11 a.m. UTC | #1
On Tue, 18 Oct 2022, Tanjuate Brunostar wrote:

> Fix checkpatch warning by merging unnecessary split line in order to
> avoid ending a line of code with a "(". The resulting code does
> not affect readability and is well within the code-style guidelines

Thanks for the patch.

You don't need the extra [PATCH] in the subject line.

Actually, you don't need the parentheses at all, but that might be a
matter of personal taste.

julia

>
> Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com>
> ---
>  drivers/staging/rts5208/sd.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/staging/rts5208/sd.c b/drivers/staging/rts5208/sd.c
> index d1fafd530c80..4643127a87ca 100644
> --- a/drivers/staging/rts5208/sd.c
> +++ b/drivers/staging/rts5208/sd.c
> @@ -4501,8 +4501,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
>  			sd_card->sd_lock_notify = 1;
>  			if (sd_lock_state &&
>  			    (sd_card->sd_lock_status & SD_LOCK_1BIT_MODE)) {
> -				sd_card->sd_lock_status |= (
> -					SD_UNLOCK_POW_ON | SD_SDR_RST);
> +				sd_card->sd_lock_status |= (SD_UNLOCK_POW_ON | SD_SDR_RST);
>  				if (CHK_SD(sd_card)) {
>  					retval = reset_sd(chip);
>  					if (retval != STATUS_SUCCESS) {
> --
> 2.34.1
>
>
>
  
Julia Lawall Oct. 18, 2022, 10:21 a.m. UTC | #2
On Tue, 18 Oct 2022, Tanju Brunostar wrote:

> Got it. 

Don't top post.  Reply to comments underneath the comment you are replying
to.

julia

>
> On Tue, Oct 18, 2022, 11:11 AM Julia Lawall <julia.lawall@inria.fr> wrote:
>
>
>       On Tue, 18 Oct 2022, Tanjuate Brunostar wrote:
>
>       > Fix checkpatch warning by merging unnecessary split line in order to
>       > avoid ending a line of code with a "(". The resulting code does
>       > not affect readability and is well within the code-style guidelines
>
>       Thanks for the patch.
>
>       You don't need the extra [PATCH] in the subject line.
>
>       Actually, you don't need the parentheses at all, but that might be a
>       matter of personal taste.
>
>       julia
>
>       >
>       > Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com>
>       > ---
>       >  drivers/staging/rts5208/sd.c | 3 +--
>       >  1 file changed, 1 insertion(+), 2 deletions(-)
>       >
>       > diff --git a/drivers/staging/rts5208/sd.c b/drivers/staging/rts5208/sd.c
>       > index d1fafd530c80..4643127a87ca 100644
>       > --- a/drivers/staging/rts5208/sd.c
>       > +++ b/drivers/staging/rts5208/sd.c
>       > @@ -4501,8 +4501,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
>       >                       sd_card->sd_lock_notify = 1;
>       >                       if (sd_lock_state &&
>       >                           (sd_card->sd_lock_status & SD_LOCK_1BIT_MODE)) {
>       > -                             sd_card->sd_lock_status |= (
>       > -                                     SD_UNLOCK_POW_ON | SD_SDR_RST);
>       > +                             sd_card->sd_lock_status |= (SD_UNLOCK_POW_ON | SD_SDR_RST);
>       >                               if (CHK_SD(sd_card)) {
>       >                                       retval = reset_sd(chip);
>       >                                       if (retval != STATUS_SUCCESS) {
>       > --
>       > 2.34.1
>       >
>       >
>       >
>
>
>
  

Patch

diff --git a/drivers/staging/rts5208/sd.c b/drivers/staging/rts5208/sd.c
index d1fafd530c80..4643127a87ca 100644
--- a/drivers/staging/rts5208/sd.c
+++ b/drivers/staging/rts5208/sd.c
@@ -4501,8 +4501,7 @@  int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 			sd_card->sd_lock_notify = 1;
 			if (sd_lock_state &&
 			    (sd_card->sd_lock_status & SD_LOCK_1BIT_MODE)) {
-				sd_card->sd_lock_status |= (
-					SD_UNLOCK_POW_ON | SD_SDR_RST);
+				sd_card->sd_lock_status |= (SD_UNLOCK_POW_ON | SD_SDR_RST);
 				if (CHK_SD(sd_card)) {
 					retval = reset_sd(chip);
 					if (retval != STATUS_SUCCESS) {