Unverified Commit 15dd0e9e authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Mark Brown
Browse files

spi: gpio: Add local struct spi_bitbang pointer in spi_gpio_probe() 



Use a local "struct spi_bitbang *bb" in spi_gpio_probe() for
brevity. No functional change intended.

Signed-off-by: default avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Chris Healy <cphealy@gmail.com>
Cc: linux-spi@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 96cad6d7

drivers/spi/spi-gpio.c

+14 −13
Original line number Diff line number Diff line
@@ -380,6 +380,7 @@ static int spi_gpio_probe(struct platform_device *pdev) 
	struct spi_gpio			*spi_gpio;

	struct spi_gpio_platform_data	*pdata;

	struct device			*dev = &pdev->dev;

	struct spi_bitbang		*bb;

	u16 master_flags = 0;

	bool use_of = 0;
@@ -434,23 +435,23 @@ static int spi_gpio_probe(struct platform_device *pdev) 
#ifdef CONFIG_OF

	master->dev.of_node = dev->of_node;

#endif



	spi_gpio->bitbang.master = master;

	spi_gpio->bitbang.chipselect = spi_gpio_chipselect;

	spi_gpio->bitbang.set_line_direction = spi_gpio_set_direction;

	bb = &spi_gpio->bitbang;

	bb->master = master;

	bb->chipselect = spi_gpio_chipselect;

	bb->set_line_direction = spi_gpio_set_direction;



	if ((master_flags & SPI_MASTER_NO_TX) == 0) {

		spi_gpio->bitbang.txrx_word[SPI_MODE_0] = spi_gpio_txrx_word_mode0;

		spi_gpio->bitbang.txrx_word[SPI_MODE_1] = spi_gpio_txrx_word_mode1;

		spi_gpio->bitbang.txrx_word[SPI_MODE_2] = spi_gpio_txrx_word_mode2;

		spi_gpio->bitbang.txrx_word[SPI_MODE_3] = spi_gpio_txrx_word_mode3;

		bb->txrx_word[SPI_MODE_0] = spi_gpio_txrx_word_mode0;

		bb->txrx_word[SPI_MODE_1] = spi_gpio_txrx_word_mode1;

		bb->txrx_word[SPI_MODE_2] = spi_gpio_txrx_word_mode2;

		bb->txrx_word[SPI_MODE_3] = spi_gpio_txrx_word_mode3;

	} else {

		spi_gpio->bitbang.txrx_word[SPI_MODE_0] = spi_gpio_spec_txrx_word_mode0;

		spi_gpio->bitbang.txrx_word[SPI_MODE_1] = spi_gpio_spec_txrx_word_mode1;

		spi_gpio->bitbang.txrx_word[SPI_MODE_2] = spi_gpio_spec_txrx_word_mode2;

		spi_gpio->bitbang.txrx_word[SPI_MODE_3] = spi_gpio_spec_txrx_word_mode3;

		bb->txrx_word[SPI_MODE_0] = spi_gpio_spec_txrx_word_mode0;

		bb->txrx_word[SPI_MODE_1] = spi_gpio_spec_txrx_word_mode1;

		bb->txrx_word[SPI_MODE_2] = spi_gpio_spec_txrx_word_mode2;

		bb->txrx_word[SPI_MODE_3] = spi_gpio_spec_txrx_word_mode3;

	}

	spi_gpio->bitbang.setup_transfer = spi_bitbang_setup_transfer;

	bb->setup_transfer = spi_bitbang_setup_transfer;



	status = spi_bitbang_start(&spi_gpio->bitbang);

	if (status)

CRA Git | Maintained and supported by SUSTech CRA and CCSE