Skip to content

Commit

Permalink
spi/orion: remove uneeded spi_info
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michael Walle authored and Mark Brown committed Jul 23, 2012
1 parent d76ea24 commit 8ceffa7
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions drivers/spi/spi-orion.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};

Expand Down Expand Up @@ -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");
Expand All @@ -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)) {
Expand Down

0 comments on commit 8ceffa7

Please sign in to comment.