Unverified Commit f1b2c1c8 authored by Alban Bedel's avatar Alban Bedel Committed by Mark Brown
Browse files

spi: ath79: Remove now useless code 



The custom setup/cleanup routines included in the ath79 driver only
take care of setting the initial CS state. However that is already
handled by the bitbang code, so this code can be removed.

Signed-off-by: default avatarAlban Bedel <albeu@free.fr>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b172fd0c

drivers/spi/spi-ath79.c

+2 −41
Original line number Diff line number Diff line
@@ -109,44 +109,6 @@ static void ath79_spi_disable(struct ath79_spi *sp) 
	ath79_spi_wr(sp, AR71XX_SPI_REG_FS, 0);

}



static int ath79_spi_setup_cs(struct spi_device *spi)

{

	struct ath79_spi *sp = ath79_spidev_to_sp(spi);



	if (!spi->cs_gpiod) {

		u32 cs_bit = AR71XX_SPI_IOC_CS(spi->chip_select);



		if (spi->mode & SPI_CS_HIGH)

			sp->ioc_base &= ~cs_bit;

		else

			sp->ioc_base |= cs_bit;



		ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, sp->ioc_base);

	}



	return 0;

}



static int ath79_spi_setup(struct spi_device *spi)

{

	int status = 0;



	if (!spi->controller_state) {

		status = ath79_spi_setup_cs(spi);

		if (status)

			return status;

	}



	status = spi_bitbang_setup(spi);



	return status;

}



static void ath79_spi_cleanup(struct spi_device *spi)

{

	spi_bitbang_cleanup(spi);

}



static u32 ath79_spi_txrx_mode0(struct spi_device *spi, unsigned int nsecs,

			       u32 word, u8 bits, unsigned flags)

{
@@ -199,8 +161,8 @@ static int ath79_spi_probe(struct platform_device *pdev) 


	master->use_gpio_descriptors = true;

	master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 32);

	master->setup = ath79_spi_setup;

	master->cleanup = ath79_spi_cleanup;

	master->setup = spi_bitbang_setup;

	master->cleanup = spi_bitbang_cleanup;

	if (pdata) {

		master->bus_num = pdata->bus_num;

		master->num_chipselect = pdata->num_chipselect;
@@ -209,7 +171,6 @@ static int ath79_spi_probe(struct platform_device *pdev) 
	sp->bitbang.master = master;

	sp->bitbang.chipselect = ath79_spi_chipselect;

	sp->bitbang.txrx_word[SPI_MODE_0] = ath79_spi_txrx_mode0;

	sp->bitbang.setup_transfer = spi_bitbang_setup_transfer;

	sp->bitbang.flags = SPI_CS_HIGH;



	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE