summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-falcon.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-02-11 15:10:19 +0100
committerMark Brown <broonie@linaro.org>2014-02-16 02:51:02 +0100
commit78e39523b8c9721250b54b7fd930aeced56cf511 (patch)
tree86e8493a6c8518b14f31153263c8902d82d94c5a /drivers/spi/spi-falcon.c
parentLinus 3.14-rc1 (diff)
downloadlinux-78e39523b8c9721250b54b7fd930aeced56cf511.tar.xz
linux-78e39523b8c9721250b54b7fd930aeced56cf511.zip
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-falcon.c')
-rw-r--r--drivers/spi/spi-falcon.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/spi/spi-falcon.c b/drivers/spi/spi-falcon.c
index dd5bd468e962..ccd257b6e2a8 100644
--- a/drivers/spi/spi-falcon.c
+++ b/drivers/spi/spi-falcon.c
@@ -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;