---

yaml --- r: 133322 b: refs/heads/master c: 4997692 h: refs/heads/master v: v3
git-mirror · Mar 11, 2009 · fabf2de · fabf2de
1 parent 8c84d09
commit fabf2de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a55026fd7a08074676e87932578ff9e327e82a3
+refs/heads/master: 49976927de5c52c415d4809c7d56700cc8ff4215
diff --git a/trunk/drivers/input/keyboard/sh_keysc.c b/trunk/drivers/input/keyboard/sh_keysc.c
@@ -257,13 +257,10 @@ static int __devexit sh_keysc_remove(struct platform_device *pdev)
 
 static int sh_keysc_suspend(struct device *dev)
 {
-	struct platform_device *pdev;
-	struct sh_keysc_priv *priv;
+	struct platform_device *pdev = to_platform_device(dev);
+	struct sh_keysc_priv *priv = platform_get_drvdata(pdev);
 	unsigned short value;
 
-	pdev = container_of(dev, struct platform_device, dev);
-	priv = platform_get_drvdata(pdev);
-
 	value = ioread16(priv->iomem_base + KYCR1_OFFS);
 
 	if (device_may_wakeup(dev))