system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-22 12:26:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

spi/orion: remove uneeded spi_info

Browse source 
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>
This commit is contained in:
Michael Walle 2012-07-23 13:16:54 +02:00 committed by Mark Brown
parent d76ea24ac4
commit 8ceffa7c4a
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/spi/spi-orion.c
View file

@ -46,7 +46,6 @@ struct orion_spi {
void __iomem *base; void __iomem *base;
unsigned int max_speed; unsigned int max_speed;
unsigned int min_speed; unsigned int min_speed;
struct orion_spi_info *spi_info;
struct clk *clk; struct clk *clk;
}; };
@ -451,14 +450,11 @@ static int __init orion_spi_probe(struct platform_device *pdev)
struct spi_master *master; struct spi_master *master;
struct orion_spi *spi; struct orion_spi *spi;
struct resource *r; struct resource *r;
struct orion_spi_info *spi_info;
unsigned long tclk_hz; unsigned long tclk_hz;
int status = 0; int status = 0;
const u32 *iprop; const u32 *iprop;
int size; int size;
spi_info = pdev->dev.platform_data;
master = spi_alloc_master(&pdev->dev, sizeof *spi); master = spi_alloc_master(&pdev->dev, sizeof *spi);
if (master == NULL) { if (master == NULL) {
dev_dbg(&pdev->dev, "master allocation failed\n"); 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 = spi_master_get_devdata(master);
spi->master = master; spi->master = master;
spi->spi_info = spi_info;
spi->clk = clk_get(&pdev->dev, NULL); spi->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(spi->clk)) { if (IS_ERR(spi->clk)) {