From f0d49ac60c3182687a7f279f910513c11db055e1 Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Wed, 13 Mar 2013 21:34:19 +0400 Subject: [PATCH] --- yaml --- r: 373171 b: refs/heads/master c: ed21465a0987e5fd81d6b47349115f2dd3d8ef9c h: refs/heads/master i: 373169: be22361a38fb4e793a58fcc3b682b3be292be84d 373167: bd1a050b41483d544cdb05831d0c11f9b3c0f8cc v: v3 --- [refs] | 2 +- trunk/drivers/mfd/syscon.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a37a73400161..999788c2b687 100644 --- 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 index 61aea6381cdf..674af1432807 100644 --- 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",