summaryrefslogtreecommitdiff
path: root/drivers/spi/xilinx_spi_pltfm.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-10-14 08:54:55 -0600
committerGrant Likely <grant.likely@secretlab.ca>2010-11-09 21:41:27 -0700
commit91565c4068042b3d8e37e64e393ca105476419bd (patch)
tree3281cb89e60641766c8cfe94ebf4fbe47baa54f0 /drivers/spi/xilinx_spi_pltfm.c
parentf6614b7bb405a9b35dd28baea989a749492c46b2 (diff)
downloadlinux-next-91565c4068042b3d8e37e64e393ca105476419bd.tar.gz
spi/xilinx: Eliminate pdata references from common code.
The current code has the OF binding modifying the platform_data pointer which it must not do, and the common code doesn't really need to use a pdata pointer. This patch eliminates the platform_data references from the common part of the driver in preparation for merging the OF and non-OF versions. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Tested-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'drivers/spi/xilinx_spi_pltfm.c')
-rw-r--r--drivers/spi/xilinx_spi_pltfm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/spi/xilinx_spi_pltfm.c b/drivers/spi/xilinx_spi_pltfm.c
index 24debac646a9..a16722acafea 100644
--- a/drivers/spi/xilinx_spi_pltfm.c
+++ b/drivers/spi/xilinx_spi_pltfm.c
@@ -54,7 +54,9 @@ static int __devinit xilinx_spi_probe(struct platform_device *dev)
if (irq < 0)
return -ENXIO;
- master = xilinx_spi_init(&dev->dev, r, irq, dev->id);
+ master = xilinx_spi_init(&dev->dev, r, irq, dev->id,
+ pdata->num_chipselect, pdata->little_endian,
+ pdata->bits_per_word);
if (!master)
return -ENODEV;