diff options
author | Axel Lin <axel.lin@ingics.com> | 2014-02-11 09:10:19 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-02-15 20:51:02 -0500 |
commit | 78e39523b8c9721250b54b7fd930aeced56cf511 (patch) | |
tree | 86e8493a6c8518b14f31153263c8902d82d94c5a /drivers/spi/spi-octeon.c | |
parent | 38dbfb59d1175ef458d006556061adeaa8751b72 (diff) |
spi: Remove explictly set bus_num and num_chipselect to default setting
The purpose of commit 1e8a52e18cfb
"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: Axel Lin <axel.lin@ingics.com>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-By: David Daney <david.daney@cavium.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi/spi-octeon.c')
-rw-r--r-- | drivers/spi/spi-octeon.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/spi/spi-octeon.c b/drivers/spi/spi-octeon.c index 67249a48b391..e31f6d833951 100644 --- a/drivers/spi/spi-octeon.c +++ b/drivers/spi/spi-octeon.c | |||
@@ -257,8 +257,6 @@ static int octeon_spi_probe(struct platform_device *pdev) | |||
257 | p->register_base = (u64)devm_ioremap(&pdev->dev, res_mem->start, | 257 | p->register_base = (u64)devm_ioremap(&pdev->dev, res_mem->start, |
258 | resource_size(res_mem)); | 258 | resource_size(res_mem)); |
259 | 259 | ||
260 | /* Dynamic bus numbering */ | ||
261 | master->bus_num = -1; | ||
262 | master->num_chipselect = 4; | 260 | master->num_chipselect = 4; |
263 | master->mode_bits = SPI_CPHA | | 261 | master->mode_bits = SPI_CPHA | |
264 | SPI_CPOL | | 262 | SPI_CPOL | |