summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorMichael Walle <michael@walle.cc>2012-07-23 13:16:54 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-23 14:14:54 +0100
commit8ceffa7c4a4c378d8e371fe2f444656e75390b34 (patch)
tree042e5dcd26f8b71c96b6446a8231cbbdd135884c /drivers/spi
parentd76ea24ac4c92e7e0700e047fcbf716c4de2b107 (diff)
downloadop-kernel-dev-8ceffa7c4a4c378d8e371fe2f444656e75390b34.zip
op-kernel-dev-8ceffa7c4a4c378d8e371fe2f444656e75390b34.tar.gz
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')
-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 74312a8..9b0cadd 100644
--- a/drivers/spi/spi-orion.c
+++ b/drivers/spi/spi-orion.c
@@ -46,7 +46,6 @@ struct orion_spi {
void __iomem *base;
unsigned int max_speed;
unsigned int min_speed;
- struct orion_spi_info *spi_info;
struct clk *clk;
};
@@ -451,14 +450,11 @@ static int __init orion_spi_probe(struct platform_device *pdev)
struct spi_master *master;
struct orion_spi *spi;
struct resource *r;
- struct orion_spi_info *spi_info;
unsigned long tclk_hz;
int status = 0;
const u32 *iprop;
int size;
- spi_info = pdev->dev.platform_data;
-
master = spi_alloc_master(&pdev->dev, sizeof *spi);
if (master == NULL) {
dev_dbg(&pdev->dev, "master allocation failed\n");
@@ -485,7 +481,6 @@ static int __init orion_spi_probe(struct platform_device *pdev)
spi = spi_master_get_devdata(master);
spi->master = master;
- spi->spi_info = spi_info;
spi->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(spi->clk)) {
OpenPOWER on IntegriCloud