---

yaml --- r: 373171 b: refs/heads/master c: ed21465 h: refs/heads/master i: 373169: be22361 373167: bd1a050 v: v3
git-mirror · Apr 5, 2013 · f0d49ac · f0d49ac
1 parent 3f84e4d
commit f0d49ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2154a2b347ca65e25ae916b9f923f0952a08e161
+refs/heads/master: ed21465a0987e5fd81d6b47349115f2dd3d8ef9c
diff --git a/trunk/drivers/mfd/syscon.c b/trunk/drivers/mfd/syscon.c
@@ -25,17 +25,15 @@
 static struct platform_driver syscon_driver;
 
 struct syscon {
-	struct device *dev;
 	void __iomem *base;
 	struct regmap *regmap;
 };
 
 static int syscon_match(struct device *dev, void *data)
 {
-	struct syscon *syscon = dev_get_drvdata(dev);
 	struct device_node *dn = data;
 
-	return (syscon->dev->of_node == dn) ? 1 : 0;
+	return (dev->of_node == dn) ? 1 : 0;
 }
 
 struct regmap *syscon_node_to_regmap(struct device_node *np)
@@ -130,7 +128,6 @@ static int syscon_probe(struct platform_device *pdev)
 		return PTR_ERR(syscon->regmap);
 	}
 
-	syscon->dev = dev;
 	platform_set_drvdata(pdev, syscon);
 
 	dev_info(dev, "syscon regmap start 0x%x end 0x%x registered\n",