diff mbox series

[v1,3/3] spidev: Simplify SPI_IOC_RD_MODE* cases in spidev_ioctl()

Message ID 20230824162209.2890440-4-andriy.shevchenko@linux.intel.com (mailing list archive)
State Accepted
Commit 764246c7feda01f46b1a243cfa15ad5627874ef9
Headers show
Series spidev: A few cleanups | expand

Commit Message

Andy Shevchenko Aug. 24, 2023, 4:22 p.m. UTC 
The temporary variable tmp is not used outside of the
SPI_IOC_RD_MODE* cases, hence we can optimize its use.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Lukas Wunner <lukas@wunner.de>
---
 drivers/spi/spidev.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Comments

Sverdlin, Alexander Aug. 25, 2023, 7:17 a.m. UTC | #1 
Hi!

On Thu, 2023-08-24 at 19:22 +0300, Andy Shevchenko wrote:
> The temporary variable tmp is not used outside of the
> SPI_IOC_RD_MODE* cases, hence we can optimize its use.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Reviewed-by: Lukas Wunner <lukas@wunner.de>

Reviewed-by: Alexander Sverdlin <alexander.sverdlin@siemens.com>

> ---
>  drivers/spi/spidev.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
> index e324b42c658c..c5450217528b 100644
> --- a/drivers/spi/spidev.c
> +++ b/drivers/spi/spidev.c
> @@ -391,17 +391,15 @@ spidev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
>         /* read requests */
>         case SPI_IOC_RD_MODE:
>         case SPI_IOC_RD_MODE32:
> -               tmp = spi->mode;
> +               tmp = spi->mode & SPI_MODE_MASK;
>  
>                 if (ctlr->use_gpio_descriptors && spi_get_csgpiod(spi, 0))
>                         tmp &= ~SPI_CS_HIGH;
>  
>                 if (cmd == SPI_IOC_RD_MODE)
> -                       retval = put_user(tmp & SPI_MODE_MASK,
> -                                         (__u8 __user *)arg);
> +                       retval = put_user(tmp, (__u8 __user *)arg);
>                 else
> -                       retval = put_user(tmp & SPI_MODE_MASK,
> -                                         (__u32 __user *)arg);
> +                       retval = put_user(tmp, (__u32 __user *)arg);
>                 break;
>         case SPI_IOC_RD_LSB_FIRST:
>                 retval = put_user((spi->mode & SPI_LSB_FIRST) ?  1 : 0,
diff mbox series

Patch

diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index e324b42c658c..c5450217528b 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -391,17 +391,15 @@  spidev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 	/* read requests */
 	case SPI_IOC_RD_MODE:
 	case SPI_IOC_RD_MODE32:
-		tmp = spi->mode;
+		tmp = spi->mode & SPI_MODE_MASK;
 
 		if (ctlr->use_gpio_descriptors && spi_get_csgpiod(spi, 0))
 			tmp &= ~SPI_CS_HIGH;
 
 		if (cmd == SPI_IOC_RD_MODE)
-			retval = put_user(tmp & SPI_MODE_MASK,
-					  (__u8 __user *)arg);
+			retval = put_user(tmp, (__u8 __user *)arg);
 		else
-			retval = put_user(tmp & SPI_MODE_MASK,
-					  (__u32 __user *)arg);
+			retval = put_user(tmp, (__u32 __user *)arg);
 		break;
 	case SPI_IOC_RD_LSB_FIRST:
 		retval = put_user((spi->mode & SPI_LSB_FIRST) ?  1 : 0,