proxmox-mirrors/mirror_ubuntu-kernels
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_ubuntu-kernels.git synced 2025-11-29 21:24:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

spidev: Decrease indentation level in spidev_ioctl() SPI_IOC_RD_MODE*

Browse Source 
Instead of defining a local controller variable inside an indented
block, move the definition to the top of spidev_ioctl() and reuse
it in the SPI_IOC_RD_MODE* and SPI_IOC_WR_MODE* cases.

This drops unneeded indentation and reduces amount of LoCs.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Alexander Sverdlin <alexander.sverdlin@siemens.com>
Link: https://lore.kernel.org/r/20230824162209.2890440-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Andy Shevchenko 2023-08-24 19:22:07 +03:00 committed by Mark Brown
parent 2d98bdad98
commit 12c8d7a76c
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/spi/spidev.c
View File

@ -357,6 +357,7 @@ spidev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
int retval = 0; int retval = 0;
struct spidev_data *spidev; struct spidev_data *spidev;
struct spi_device *spi; struct spi_device *spi;
struct spi_controller *ctlr;
u32 tmp; u32 tmp;
unsigned n_ioc; unsigned n_ioc;
struct spi_ioc_transfer *ioc; struct spi_ioc_transfer *ioc;
@ -376,6 +377,8 @@ spidev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
return -ESHUTDOWN; return -ESHUTDOWN;
} }
ctlr = spi->controller;
/* use the buffer lock here for triple duty: /* use the buffer lock here for triple duty:
* - prevent I/O (from us) so calling spi_setup() is safe; * - prevent I/O (from us) so calling spi_setup() is safe;
* - prevent concurrent SPI_IOC_WR_* from morphing * - prevent concurrent SPI_IOC_WR_* from morphing
@ -390,13 +393,9 @@ spidev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
case SPI_IOC_RD_MODE32: case SPI_IOC_RD_MODE32:
tmp = spi->mode; tmp = spi->mode;
{
struct spi_controller *ctlr = spi->controller;
if (ctlr->use_gpio_descriptors && ctlr->cs_gpiods && if (ctlr->use_gpio_descriptors && ctlr->cs_gpiods &&
ctlr->cs_gpiods[spi_get_chipselect(spi, 0)]) ctlr->cs_gpiods[spi_get_chipselect(spi, 0)])
tmp &= ~SPI_CS_HIGH; tmp &= ~SPI_CS_HIGH;
}
if (cmd == SPI_IOC_RD_MODE) if (cmd == SPI_IOC_RD_MODE)
retval = put_user(tmp & SPI_MODE_MASK, retval = put_user(tmp & SPI_MODE_MASK,
@ -424,7 +423,6 @@ spidev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
else else
retval = get_user(tmp, (u32 __user *)arg); retval = get_user(tmp, (u32 __user *)arg);
if (retval == 0) { if (retval == 0) {
struct spi_controller *ctlr = spi->controller;
u32 save = spi->mode; u32 save = spi->mode;
if (tmp & ~SPI_MODE_MASK) { if (tmp & ~SPI_MODE_MASK) {