summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-octeon.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-02-11 22:10:19 +0800
committerMark Brown <broonie@linaro.org>2014-02-16 09:51:02 +0800
commit78e39523b8c9721250b54b7fd930aeced56cf511 (patch)
tree86e8493a6c8518b14f31153263c8902d82d94c5a /drivers/spi/spi-octeon.c
parent38dbfb59d1175ef458d006556061adeaa8751b72 (diff)
downloadop-kernel-dev-78e39523b8c9721250b54b7fd930aeced56cf511.zip
op-kernel-dev-78e39523b8c9721250b54b7fd930aeced56cf511.tar.gz
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.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/spi/spi-octeon.c b/drivers/spi/spi-octeon.c
index 67249a4..e31f6d8 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)
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 |
OpenPOWER on IntegriCloud