Unverified Commit 12c8d7a7 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mark Brown
Browse files

spidev: Decrease indentation level in spidev_ioctl() SPI_IOC_RD_MODE* 



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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarAlexander Sverdlin <alexander.sverdlin@siemens.com>
Link: https://lore.kernel.org/r/20230824162209.2890440-2-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2d98bdad

drivers/spi/spidev.c

+6 −8
Original line number Diff line number Diff line
@@ -357,6 +357,7 @@ spidev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
	int			retval = 0;

	struct spidev_data	*spidev;

	struct spi_device	*spi;

	struct spi_controller	*ctlr;

	u32			tmp;

	unsigned		n_ioc;

	struct spi_ioc_transfer	*ioc;
@@ -376,6 +377,8 @@ spidev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
		return -ESHUTDOWN;

	}



	ctlr = spi->controller;



	/* use the buffer lock here for triple duty:

	 *  - prevent I/O (from us) so calling spi_setup() is safe;

	 *  - 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:

		tmp = spi->mode;



		{

			struct spi_controller *ctlr = spi->controller;



		if (ctlr->use_gpio_descriptors && ctlr->cs_gpiods &&

		    ctlr->cs_gpiods[spi_get_chipselect(spi, 0)])

			tmp &= ~SPI_CS_HIGH;

		}



		if (cmd == SPI_IOC_RD_MODE)

			retval = put_user(tmp & SPI_MODE_MASK,
@@ -424,7 +423,6 @@ spidev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
		else

			retval = get_user(tmp, (u32 __user *)arg);

		if (retval == 0) {

			struct spi_controller *ctlr = spi->controller;

			u32	save = spi->mode;



			if (tmp & ~SPI_MODE_MASK) {