Skip to contentSkip to conversation

spi/pl022: skip default configuration before suspending

PATCH New Linus Walleij 3 participants 3 messages Nov 9, 2011

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 4/6 spi/pl022: skip default configuration before suspending

From: Virupax Sadashivpetimath <[email protected]>

The loading of the default configuration before suspending has been in the driver since its inception, but it is not really needed. Especially so since we take to all the trouble of enabling and disabling power and clock just to do this. Let's scrap this now.

---
 drivers/spi/spi-pl022.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)
drivers/spi/spi-pl022.c +1 -6
index fa3eaae..bffad2a 100644
@@ -2314,12 +2314,7 @@ static int pl022_suspend(struct device *dev)
 		return status;
 	}
 
-	amba_vcore_enable(pl022->adev);
-	amba_pclk_enable(pl022->adev);
-	load_ssp_default_config(pl022);
-	amba_pclk_disable(pl022->adev);
-	amba_vcore_disable(pl022->adev);
-	dev_dbg(dev, "suspended\n");
+	dev_dbg(&adev->dev, "suspended\n");
 	return 0;
 }
 
Signature · 1 line
1.7.3.2
#1 lore raw

PATCH 4/6 spi/pl022: skip default configuration before suspending

Quoted 19 lines · Linus WALLEIJ

From: Virupax Sadashivpetimath <[email protected]>

The loading of the default configuration before suspending has been in the driver since its inception, but it is not really needed. Especially so since we take to all the trouble of enabling and disabling power and clock just to do this. Let's scrap this now.

---
 drivers/spi/spi-pl022.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)
drivers/spi/spi-pl022.c +0 -0
index fa3eaae..bffad2a 100644

drivers/spi/spi-pl022.c static int pl022_suspend(struct device *dev) · line 2317

Quoted 10 lines
drivers/spi/spi-pl022.c +1 -6
@@ -2314,12 +2314,7 @@ static int pl022_suspend(struct device *dev)
 		return status;
 	}
 
-	amba_vcore_enable(pl022->adev);
-	amba_pclk_enable(pl022->adev);
-	load_ssp_default_config(pl022);
-	amba_pclk_disable(pl022->adev);
-	amba_vcore_disable(pl022->adev);
-	dev_dbg(dev, "suspended\n");
+	dev_dbg(&adev->dev, "suspended\n");

why adev->dev instead of dev?

Quoted 3 lines
drivers/spi/spi-pl022.c +0 -0
 	return 0;
 }
 
Signature · 1 line
viresh
#2 lore raw

PATCH 4/6 spi/pl022: skip default configuration before suspending

Quoted 11 lines · Viresh Kumar
Quoted 8 lines · Linus WALLEIJ

- ? ? amba_vcore_enable(pl022->adev);
- ? ? amba_pclk_enable(pl022->adev);
- ? ? load_ssp_default_config(pl022);
- ? ? amba_pclk_disable(pl022->adev);
- ? ? amba_vcore_disable(pl022->adev);
- ? ? dev_dbg(dev, "suspended\n");
+ ? ? dev_dbg(&adev->dev, "suspended\n");

why adev->dev instead of dev?

Plain bug. It doesn't even compile with -DDEBUG :-/

I'll fix it up..

Linus