aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-orion.c
diff options
context:
space:
mode:
authorMichael Walle <michael@walle.cc>2012-07-23 07:16:54 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-23 09:14:54 -0400
commit8ceffa7c4a4c378d8e371fe2f444656e75390b34 (patch)
tree042e5dcd26f8b71c96b6446a8231cbbdd135884c /drivers/spi/spi-orion.c
parentd76ea24ac4c92e7e0700e047fcbf716c4de2b107 (diff)
spi/orion: remove uneeded spi_info
This was formerly used to store the tclk value. This is now discovered using the clk API, rather than pass it as platform data. Signed-off-by: Michael Walle <michael@walle.cc> Acked-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Andrew Lunn <andrew@lunn.ch> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@googlemail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/spi/spi-orion.c')
-rw-r--r--drivers/spi/spi-orion.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c
index 74312a862ba8..9b0caddce503 100644
--- a/drivers/spi/spi-orion.c
+++ b/drivers/spi/spi-orion.c
@@ -46,7 +46,6 @@ struct orion_spi {
46 void __iomem *base; 46 void __iomem *base;
47 unsigned int max_speed; 47 unsigned int max_speed;
48 unsigned int min_speed; 48 unsigned int min_speed;
49 struct orion_spi_info *spi_info;
50 struct clk *clk; 49 struct clk *clk;
51}; 50};
52 51
@@ -451,14 +450,11 @@ static int __init orion_spi_probe(struct platform_device *pdev)
451 struct spi_master *master; 450 struct spi_master *master;
452 struct orion_spi *spi; 451 struct orion_spi *spi;
453 struct resource *r; 452 struct resource *r;
454 struct orion_spi_info *spi_info;
455 unsigned long tclk_hz; 453 unsigned long tclk_hz;
456 int status = 0; 454 int status = 0;
457 const u32 *iprop; 455 const u32 *iprop;
458 int size; 456 int size;
459 457
460 spi_info = pdev->dev.platform_data;
461
462 master = spi_alloc_master(&pdev->dev, sizeof *spi); 458 master = spi_alloc_master(&pdev->dev, sizeof *spi);
463 if (master == NULL) { 459 if (master == NULL) {
464 dev_dbg(&pdev->dev, "master allocation failed\n"); 460 dev_dbg(&pdev->dev, "master allocation failed\n");
@@ -485,7 +481,6 @@ static int __init orion_spi_probe(struct platform_device *pdev)
485 481
486 spi = spi_master_get_devdata(master); 482 spi = spi_master_get_devdata(master);
487 spi->master = master; 483 spi->master = master;
488 spi->spi_info = spi_info;
489 484
490 spi->clk = clk_get(&pdev->dev, NULL); 485 spi->clk = clk_get(&pdev->dev, NULL);
491 if (IS_ERR(spi->clk)) { 486 if (IS_ERR(spi->clk)) {