diff options
author | Alexander Shiyan <shc_work@mail.ru> | 2013-07-14 08:39:42 +0200 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-07-31 02:02:58 +0200 |
commit | f10111cc83b07251e4f8788343c952a5742d748e (patch) | |
tree | 4d1466493f6412e55359eebfbecebabf7a590118 /drivers/mfd/syscon.c | |
parent | mfd: twl6040: Cleanup in early error handling in probe function (diff) | |
download | linux-f10111cc83b07251e4f8788343c952a5742d748e.tar.xz linux-f10111cc83b07251e4f8788343c952a5742d748e.zip |
mfd: syscon: Remove "base" field from private driver data
During a move to use managed resources, the .remove function all was
deemed superfluous which subsequently led to its deletion. As there are
no remaining users of the stored 'base' address we only have to use it
locally during probe.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/syscon.c')
-rw-r--r-- | drivers/mfd/syscon.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c index 1a31512369f9..27db1f92bb26 100644 --- a/drivers/mfd/syscon.c +++ b/drivers/mfd/syscon.c @@ -25,7 +25,6 @@ static struct platform_driver syscon_driver; struct syscon { - void __iomem *base; struct regmap *regmap; }; @@ -129,6 +128,7 @@ static int syscon_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct syscon *syscon; struct resource *res; + void __iomem *base; syscon = devm_kzalloc(dev, sizeof(*syscon), GFP_KERNEL); if (!syscon) @@ -138,12 +138,12 @@ static int syscon_probe(struct platform_device *pdev) if (!res) return -ENOENT; - syscon->base = devm_ioremap(dev, res->start, resource_size(res)); - if (!syscon->base) + base = devm_ioremap(dev, res->start, resource_size(res)); + if (!base) return -ENOMEM; syscon_regmap_config.max_register = res->end - res->start - 3; - syscon->regmap = devm_regmap_init_mmio(dev, syscon->base, + syscon->regmap = devm_regmap_init_mmio(dev, base, &syscon_regmap_config); if (IS_ERR(syscon->regmap)) { dev_err(dev, "regmap init failed\n"); |