From f10111cc83b07251e4f8788343c952a5742d748e Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Sun, 14 Jul 2013 10:39:42 +0400 Subject: 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 Signed-off-by: Lee Jones Signed-off-by: Samuel Ortiz --- drivers/mfd/syscon.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/mfd/syscon.c') 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"); -- cgit v1.2.3 From 5104d2656d4874c51868dc7182016e9501ec99ca Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Thu, 18 Jul 2013 22:34:52 +0400 Subject: ARM: clps711x: Remove the special name for the syscon driver This is a partial revert of the patch: "6597619f9c ARM: clps711x: Add support for SYSCON driver". No reason to make SYSCON driver name unique to that processor. Signed-off-by: Alexander Shiyan Signed-off-by: Olof Johansson --- drivers/mfd/syscon.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'drivers/mfd/syscon.c') diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c index 1a31512369f9..962a6e17a01a 100644 --- a/drivers/mfd/syscon.c +++ b/drivers/mfd/syscon.c @@ -159,9 +159,6 @@ static int syscon_probe(struct platform_device *pdev) static const struct platform_device_id syscon_ids[] = { { "syscon", }, -#ifdef CONFIG_ARCH_CLPS711X - { "clps711x-syscon", }, -#endif { } }; -- cgit v1.2.3