From 2ccbe6f6398181f1c2ef17b4bb402565055d0f56 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 23 Oct 2012 14:02:21 +0100 Subject: [PATCH] --- yaml --- r: 343624 b: refs/heads/master c: 32111abb508424d1d110fa471d940160abe251f5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi-pl022.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2e4bccf67056..fe9508a251e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4482afeb7e91dabd8a2d6570a1b216eb34408a6 +refs/heads/master: 32111abb508424d1d110fa471d940160abe251f5 diff --git a/trunk/drivers/spi/spi-pl022.c b/trunk/drivers/spi/spi-pl022.c index 0205d470fde6..1361868fced7 100644 --- a/trunk/drivers/spi/spi-pl022.c +++ b/trunk/drivers/spi/spi-pl022.c @@ -2192,9 +2192,6 @@ pl022_probe(struct amba_device *adev, const struct amba_id *id) printk(KERN_INFO "pl022: mapped registers from 0x%08x to %p\n", adev->res.start, pl022->virtbase); - pm_runtime_enable(dev); - pm_runtime_resume(dev); - pl022->clk = devm_clk_get(&adev->dev, NULL); if (IS_ERR(pl022->clk)) { status = PTR_ERR(pl022->clk); @@ -2298,7 +2295,6 @@ pl022_remove(struct amba_device *adev) clk_disable(pl022->clk); clk_unprepare(pl022->clk); - pm_runtime_disable(&adev->dev); amba_release_regions(adev); tasklet_disable(&pl022->pump_transfers); spi_unregister_master(pl022->master);