Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78e39523 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

spi: Remove explictly set bus_num and num_chipselect to default setting 



The purpose of commit 1e8a52e1
"spi: By default setup spi_masters with 1 chipselect and dynamics bus number"
is to avoid setting default value for bus_num and num_chipselect in spi master
drivers. So let's remove the duplicate code.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-By: default avatarDavid Daney <david.daney@cavium.com>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 38dbfb59

drivers/spi/spi-bcm2835.c

+0 −1
Original line number Diff line number Diff line
@@ -315,7 +315,6 @@ static int bcm2835_spi_probe(struct platform_device *pdev) 


	master->mode_bits = BCM2835_SPI_MODE_BITS;

	master->bits_per_word_mask = SPI_BPW_MASK(8);

	master->bus_num = -1;

	master->num_chipselect = 3;

	master->transfer_one_message = bcm2835_spi_transfer_one;

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

drivers/spi/spi-efm32.c

+0 −4
Original line number Diff line number Diff line
@@ -308,10 +308,6 @@ static int efm32_spi_probe_dt(struct platform_device *pdev, 
	}



	ddata->pdata.location = location;



	/* spi core takes care about the bus number using an alias */

	master->bus_num = -1;



	return 0;

}

drivers/spi/spi-falcon.c

+0 −2
Original line number Diff line number Diff line
@@ -422,9 +422,7 @@ static int falcon_sflash_probe(struct platform_device *pdev) 
	priv->master = master;



	master->mode_bits = SPI_MODE_3;

	master->num_chipselect = 1;

	master->flags = SPI_MASTER_HALF_DUPLEX;

	master->bus_num = -1;

	master->setup = falcon_sflash_setup;

	master->prepare_transfer_hardware = falcon_sflash_prepare_xfer;

	master->transfer_one_message = falcon_sflash_xfer_one;

drivers/spi/spi-octeon.c

+0 −2
Original line number Diff line number Diff line
@@ -257,8 +257,6 @@ static int octeon_spi_probe(struct platform_device *pdev) 
	p->register_base = (u64)devm_ioremap(&pdev->dev, res_mem->start,

					     resource_size(res_mem));



	/* Dynamic bus numbering */

	master->bus_num = -1;

	master->num_chipselect = 4;

	master->mode_bits = SPI_CPHA |

			    SPI_CPOL |

drivers/spi/spi-sh-hspi.c

+0 −1
Original line number Diff line number Diff line
@@ -298,7 +298,6 @@ static int hspi_probe(struct platform_device *pdev) 


	pm_runtime_enable(&pdev->dev);



	master->num_chipselect	= 1;

	master->bus_num		= pdev->id;

	master->setup		= hspi_setup;

	master->cleanup		= hspi_cleanup;