Re: [PATCH] staging: rts5208: Fix 80 char warning by re-structuring if-blocks.

[Greg KH]

On Wed, Sep 04, 2019 at 06:35:23PM +0530, Prakhar Sinha wrote:
> This patch solves the following checkpatch.pl's messages in
> drivers/staging/rts5208/sd.c
> 
> WARNING: line over 80 characters
> 4517: FILE: drivers/staging/rts5208/sd.c:4517:
> +                                               sd_card->sd_lock_status &= ~(SD_UNLOCK_POW_ON | SD_SDR_RST);
> 
> WARNING: line over 80 characters
> 4518: FILE: drivers/staging/rts5208/sd.c:4518:
> +                                               goto sd_execute_write_cmd_failed;
> 
> WARNING: line over 80 characters
> 4522: FILE: drivers/staging/rts5208/sd.c:4522:
> +                               sd_card->sd_lock_status &= ~(SD_UNLOCK_POW_ON | SD_SDR_RST);
> 
> Signed-off-by: Prakhar Sinha <prakharsinha2808@xxxxxxxxx>
> ---
>  drivers/staging/rts5208/sd.c | 26 ++++++++++++--------------
>  1 file changed, 12 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/staging/rts5208/sd.c b/drivers/staging/rts5208/sd.c
> index a06045344301..7d6f2c56e740 100644
> --- a/drivers/staging/rts5208/sd.c
> +++ b/drivers/staging/rts5208/sd.c
> @@ -4505,22 +4505,20 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
>  
>  		dev_dbg(rtsx_dev(chip), "sd_lock_state = 0x%x, sd_card->sd_lock_status = 0x%x\n",
>  			sd_lock_state, sd_card->sd_lock_status);
> -		if (sd_lock_state ^ (sd_card->sd_lock_status & SD_LOCKED)) {
> +		if (sd_lock_state ^ (sd_card->sd_lock_status & SD_LOCKED))
>  			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);
> -				if (CHK_SD(sd_card)) {
> -					retval = reset_sd(chip);
> -					if (retval != STATUS_SUCCESS) {
> -						sd_card->sd_lock_status &= ~(SD_UNLOCK_POW_ON | SD_SDR_RST);
> -						goto sd_execute_write_cmd_failed;
> -					}
> -				}
> -
> -				sd_card->sd_lock_status &= ~(SD_UNLOCK_POW_ON | SD_SDR_RST);
> +		if ((sd_lock_state & !(sd_card->sd_lock_status & SD_LOCKED)) &&
> +		    (sd_card->sd_lock_status & SD_LOCK_1BIT_MODE)) {
> +			sd_card->sd_lock_status |= (SD_UNLOCK_POW_ON |
> +						    SD_SDR_RST);
> +			if (CHK_SD(sd_card) &&
> +			    reset_sd(chip) != STATUS_SUCCESS) {
> +				sd_card->sd_lock_status &= ~(SD_UNLOCK_POW_ON |
> +							     SD_SDR_RST);
> +				goto sd_execute_write_cmd_failed;
>  			}
> +			sd_card->sd_lock_status &= ~(SD_UNLOCK_POW_ON |
> +						     SD_SDR_RST);

Are you sure you can indent and call the if() statement twice like this?

If so, please document this in your changelog text.

thanks,

greg k-h