diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-23 09:02:21 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-23 09:02:21 -0400 |
commit | 32111abb508424d1d110fa471d940160abe251f5 (patch) | |
tree | b44ace0e8ddfd249643cbe4b2c38e89238921fb7 /drivers/spi/spi-pl022.c | |
parent | b4482afeb7e91dabd8a2d6570a1b216eb34408a6 (diff) | |
parent | 213d27a42ce1646989966011d2af8563feac5635 (diff) |
Merge tag 'spi-linus' into spi-next
spi: Fixes for v3.7
A bunch of fixes here, mostly minor except for the pl022 which has just
been a bit of a shambles all round, the recent runtime PM changes have
as far as I can tell never worked so they're just getting thrown out.
Conflicts:
drivers/spi/spi-pl022.c
Diffstat (limited to 'drivers/spi/spi-pl022.c')
-rw-r--r-- | drivers/spi/spi-pl022.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index 0205d470fde6..1361868fced7 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c | |||
@@ -2192,9 +2192,6 @@ pl022_probe(struct amba_device *adev, const struct amba_id *id) | |||
2192 | printk(KERN_INFO "pl022: mapped registers from 0x%08x to %p\n", | 2192 | printk(KERN_INFO "pl022: mapped registers from 0x%08x to %p\n", |
2193 | adev->res.start, pl022->virtbase); | 2193 | adev->res.start, pl022->virtbase); |
2194 | 2194 | ||
2195 | pm_runtime_enable(dev); | ||
2196 | pm_runtime_resume(dev); | ||
2197 | |||
2198 | pl022->clk = devm_clk_get(&adev->dev, NULL); | 2195 | pl022->clk = devm_clk_get(&adev->dev, NULL); |
2199 | if (IS_ERR(pl022->clk)) { | 2196 | if (IS_ERR(pl022->clk)) { |
2200 | status = PTR_ERR(pl022->clk); | 2197 | status = PTR_ERR(pl022->clk); |
@@ -2298,7 +2295,6 @@ pl022_remove(struct amba_device *adev) | |||
2298 | 2295 | ||
2299 | clk_disable(pl022->clk); | 2296 | clk_disable(pl022->clk); |
2300 | clk_unprepare(pl022->clk); | 2297 | clk_unprepare(pl022->clk); |
2301 | pm_runtime_disable(&adev->dev); | ||
2302 | amba_release_regions(adev); | 2298 | amba_release_regions(adev); |
2303 | tasklet_disable(&pl022->pump_transfers); | 2299 | tasklet_disable(&pl022->pump_transfers); |
2304 | spi_unregister_master(pl022->master); | 2300 | spi_unregister_master(pl022->master); |