* [PATCH v3 0/3] arm: mvebu: fix resource leak
@ 2013-08-26 9:56 ` Jisheng Zhang
0 siblings, 0 replies; 12+ messages in thread
From: Jisheng Zhang @ 2013-08-26 9:56 UTC (permalink / raw)
To: jszhang, jason, andrew, gregory.clement, thomas.petazzoni,
ezequiel.garcia, mturquette, sebastian.hesselbarth, linus.walleij
Cc: linux, linux-arm-kernel, linux-kernel
These patches try to fix resource leak by adding missing of_node_put(),
iounmap or using devm_ioremap_resource() if available.
v3:
- remove the clk patch since it's already taken by Mike
- Add Reviewed-by: Ezequiel Garcia
v2:
- use devm_ioremap_resource() as suggested by Ezequiel Garcia
- use gates_out instead of bail_out as suggested by Mike Turquette
Jisheng Zhang (3):
arm: mvebu: add missing of_node_put() to fix reference leak
bus: mvebu: add missing of_node_put() to fix reference leak
pinctrl: mvebu: Convert to use devm_ioremap_resource
arch/arm/mach-mvebu/armada-370-xp.c | 1 +
arch/arm/mach-mvebu/coherency.c | 8 +++++++-
arch/arm/mach-mvebu/platsmp.c | 1 +
arch/arm/mach-mvebu/pmsu.c | 1 +
arch/arm/mach-mvebu/system-controller.c | 1 +
drivers/bus/mvebu-mbus.c | 6 +++++-
drivers/pinctrl/mvebu/pinctrl-mvebu.c | 11 +++++------
7 files changed, 21 insertions(+), 8 deletions(-)
--
1.8.4.rc3
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v3 1/3] arm: mvebu: add missing of_node_put() to fix reference leak
2013-08-26 9:56 ` Jisheng Zhang
@ 2013-08-26 9:56 ` Jisheng Zhang
-1 siblings, 0 replies; 12+ messages in thread
From: Jisheng Zhang @ 2013-08-26 9:56 UTC (permalink / raw)
To: linux-arm-kernel
Add of_node_put to properly decrement the refcount when we are
done using a given node.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Reviewed-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
arch/arm/mach-mvebu/armada-370-xp.c | 1 +
arch/arm/mach-mvebu/coherency.c | 8 +++++++-
arch/arm/mach-mvebu/platsmp.c | 1 +
arch/arm/mach-mvebu/pmsu.c | 1 +
arch/arm/mach-mvebu/system-controller.c | 1 +
5 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
index 97cbb80..8a1ae83 100644
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@ -64,6 +64,7 @@ static void __init armada_370_xp_mbus_init(void)
ARMADA_370_XP_MBUS_WINS_SIZE,
of_translate_address(dn, &sdram_wins_offs),
ARMADA_370_XP_SDRAM_WINS_SIZE);
+ of_node_put(dn);
}
static void __init armada_370_xp_timer_and_clk_init(void)
diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
index 4c24303..58adf2f 100644
--- a/arch/arm/mach-mvebu/coherency.c
+++ b/arch/arm/mach-mvebu/coherency.c
@@ -140,6 +140,7 @@ int __init coherency_init(void)
coherency_base = of_iomap(np, 0);
coherency_cpu_base = of_iomap(np, 1);
set_cpu_coherent(cpu_logical_map(smp_processor_id()), 0);
+ of_node_put(np);
}
return 0;
@@ -147,9 +148,14 @@ int __init coherency_init(void)
static int __init coherency_late_init(void)
{
- if (of_find_matching_node(NULL, of_coherency_table))
+ struct device_node *np;
+
+ np = of_find_matching_node(NULL, of_coherency_table);
+ if (np) {
bus_register_notifier(&platform_bus_type,
&mvebu_hwcc_platform_nb);
+ of_node_put(np);
+ }
return 0;
}
diff --git a/arch/arm/mach-mvebu/platsmp.c b/arch/arm/mach-mvebu/platsmp.c
index ce81d30..e7edb82 100644
--- a/arch/arm/mach-mvebu/platsmp.c
+++ b/arch/arm/mach-mvebu/platsmp.c
@@ -95,6 +95,7 @@ static void __init armada_xp_smp_init_cpus(void)
panic("No 'cpus' node found\n");
ncores = of_get_child_count(np);
+ of_node_put(np);
if (ncores == 0 || ncores > ARMADA_XP_MAX_CPUS)
panic("Invalid number of CPUs in DT\n");
diff --git a/arch/arm/mach-mvebu/pmsu.c b/arch/arm/mach-mvebu/pmsu.c
index 3cc4bef..27fc4f0 100644
--- a/arch/arm/mach-mvebu/pmsu.c
+++ b/arch/arm/mach-mvebu/pmsu.c
@@ -67,6 +67,7 @@ int __init armada_370_xp_pmsu_init(void)
pr_info("Initializing Power Management Service Unit\n");
pmsu_mp_base = of_iomap(np, 0);
pmsu_reset_base = of_iomap(np, 1);
+ of_node_put(np);
}
return 0;
diff --git a/arch/arm/mach-mvebu/system-controller.c b/arch/arm/mach-mvebu/system-controller.c
index f875124..5175083c 100644
--- a/arch/arm/mach-mvebu/system-controller.c
+++ b/arch/arm/mach-mvebu/system-controller.c
@@ -98,6 +98,7 @@ static int __init mvebu_system_controller_init(void)
BUG_ON(!match);
system_controller_base = of_iomap(np, 0);
mvebu_sc = (struct mvebu_system_controller *)match->data;
+ of_node_put(np);
}
return 0;
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v3 1/3] arm: mvebu: add missing of_node_put() to fix reference leak
@ 2013-08-26 9:56 ` Jisheng Zhang
0 siblings, 0 replies; 12+ messages in thread
From: Jisheng Zhang @ 2013-08-26 9:56 UTC (permalink / raw)
To: jszhang, jason, andrew, gregory.clement, thomas.petazzoni,
ezequiel.garcia, mturquette, sebastian.hesselbarth, linus.walleij
Cc: linux, linux-arm-kernel, linux-kernel
Add of_node_put to properly decrement the refcount when we are
done using a given node.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Reviewed-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
arch/arm/mach-mvebu/armada-370-xp.c | 1 +
arch/arm/mach-mvebu/coherency.c | 8 +++++++-
arch/arm/mach-mvebu/platsmp.c | 1 +
arch/arm/mach-mvebu/pmsu.c | 1 +
arch/arm/mach-mvebu/system-controller.c | 1 +
5 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
index 97cbb80..8a1ae83 100644
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@ -64,6 +64,7 @@ static void __init armada_370_xp_mbus_init(void)
ARMADA_370_XP_MBUS_WINS_SIZE,
of_translate_address(dn, &sdram_wins_offs),
ARMADA_370_XP_SDRAM_WINS_SIZE);
+ of_node_put(dn);
}
static void __init armada_370_xp_timer_and_clk_init(void)
diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
index 4c24303..58adf2f 100644
--- a/arch/arm/mach-mvebu/coherency.c
+++ b/arch/arm/mach-mvebu/coherency.c
@@ -140,6 +140,7 @@ int __init coherency_init(void)
coherency_base = of_iomap(np, 0);
coherency_cpu_base = of_iomap(np, 1);
set_cpu_coherent(cpu_logical_map(smp_processor_id()), 0);
+ of_node_put(np);
}
return 0;
@@ -147,9 +148,14 @@ int __init coherency_init(void)
static int __init coherency_late_init(void)
{
- if (of_find_matching_node(NULL, of_coherency_table))
+ struct device_node *np;
+
+ np = of_find_matching_node(NULL, of_coherency_table);
+ if (np) {
bus_register_notifier(&platform_bus_type,
&mvebu_hwcc_platform_nb);
+ of_node_put(np);
+ }
return 0;
}
diff --git a/arch/arm/mach-mvebu/platsmp.c b/arch/arm/mach-mvebu/platsmp.c
index ce81d30..e7edb82 100644
--- a/arch/arm/mach-mvebu/platsmp.c
+++ b/arch/arm/mach-mvebu/platsmp.c
@@ -95,6 +95,7 @@ static void __init armada_xp_smp_init_cpus(void)
panic("No 'cpus' node found\n");
ncores = of_get_child_count(np);
+ of_node_put(np);
if (ncores == 0 || ncores > ARMADA_XP_MAX_CPUS)
panic("Invalid number of CPUs in DT\n");
diff --git a/arch/arm/mach-mvebu/pmsu.c b/arch/arm/mach-mvebu/pmsu.c
index 3cc4bef..27fc4f0 100644
--- a/arch/arm/mach-mvebu/pmsu.c
+++ b/arch/arm/mach-mvebu/pmsu.c
@@ -67,6 +67,7 @@ int __init armada_370_xp_pmsu_init(void)
pr_info("Initializing Power Management Service Unit\n");
pmsu_mp_base = of_iomap(np, 0);
pmsu_reset_base = of_iomap(np, 1);
+ of_node_put(np);
}
return 0;
diff --git a/arch/arm/mach-mvebu/system-controller.c b/arch/arm/mach-mvebu/system-controller.c
index f875124..5175083c 100644
--- a/arch/arm/mach-mvebu/system-controller.c
+++ b/arch/arm/mach-mvebu/system-controller.c
@@ -98,6 +98,7 @@ static int __init mvebu_system_controller_init(void)
BUG_ON(!match);
system_controller_base = of_iomap(np, 0);
mvebu_sc = (struct mvebu_system_controller *)match->data;
+ of_node_put(np);
}
return 0;
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v3 1/3] arm: mvebu: add missing of_node_put() to fix reference leak
2013-08-26 9:56 ` Jisheng Zhang
@ 2013-08-26 10:02 ` Thomas Petazzoni
-1 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2013-08-26 10:02 UTC (permalink / raw)
To: linux-arm-kernel
Dear Jisheng Zhang,
On Mon, 26 Aug 2013 17:56:19 +0800, Jisheng Zhang wrote:
> diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
> index 97cbb80..8a1ae83 100644
> --- a/arch/arm/mach-mvebu/armada-370-xp.c
> +++ b/arch/arm/mach-mvebu/armada-370-xp.c
> @@ -64,6 +64,7 @@ static void __init armada_370_xp_mbus_init(void)
> ARMADA_370_XP_MBUS_WINS_SIZE,
> of_translate_address(dn, &sdram_wins_offs),
> ARMADA_370_XP_SDRAM_WINS_SIZE);
> + of_node_put(dn);
> }
With the integration of Ezequiel patches that add DT support to the
mvebu-mbus driver, this chunk of the code is no longer needed, as of
linux-next.
Best regards,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3 1/3] arm: mvebu: add missing of_node_put() to fix reference leak
@ 2013-08-26 10:02 ` Thomas Petazzoni
0 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2013-08-26 10:02 UTC (permalink / raw)
To: Jisheng Zhang
Cc: jason, andrew, gregory.clement, ezequiel.garcia, mturquette,
sebastian.hesselbarth, linus.walleij, linux, linux-arm-kernel,
linux-kernel
Dear Jisheng Zhang,
On Mon, 26 Aug 2013 17:56:19 +0800, Jisheng Zhang wrote:
> diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
> index 97cbb80..8a1ae83 100644
> --- a/arch/arm/mach-mvebu/armada-370-xp.c
> +++ b/arch/arm/mach-mvebu/armada-370-xp.c
> @@ -64,6 +64,7 @@ static void __init armada_370_xp_mbus_init(void)
> ARMADA_370_XP_MBUS_WINS_SIZE,
> of_translate_address(dn, &sdram_wins_offs),
> ARMADA_370_XP_SDRAM_WINS_SIZE);
> + of_node_put(dn);
> }
With the integration of Ezequiel patches that add DT support to the
mvebu-mbus driver, this chunk of the code is no longer needed, as of
linux-next.
Best regards,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v3 1/3] arm: mvebu: add missing of_node_put() to fix reference leak
2013-08-26 10:02 ` Thomas Petazzoni
@ 2013-08-26 10:06 ` Jisheng Zhang
-1 siblings, 0 replies; 12+ messages in thread
From: Jisheng Zhang @ 2013-08-26 10:06 UTC (permalink / raw)
To: linux-arm-kernel
Dear Thomas,
On Mon, 26 Aug 2013 03:02:00 -0700
Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:
> Dear Jisheng Zhang,
>
> On Mon, 26 Aug 2013 17:56:19 +0800, Jisheng Zhang wrote:
>
> > diff --git a/arch/arm/mach-mvebu/armada-370-xp.c
> > b/arch/arm/mach-mvebu/armada-370-xp.c index 97cbb80..8a1ae83 100644
> > --- a/arch/arm/mach-mvebu/armada-370-xp.c
> > +++ b/arch/arm/mach-mvebu/armada-370-xp.c
> > @@ -64,6 +64,7 @@ static void __init armada_370_xp_mbus_init(void)
> > ARMADA_370_XP_MBUS_WINS_SIZE,
> > of_translate_address(dn, &sdram_wins_offs),
> > ARMADA_370_XP_SDRAM_WINS_SIZE);
> > + of_node_put(dn);
> > }
>
> With the integration of Ezequiel patches that add DT support to the
> mvebu-mbus driver, this chunk of the code is no longer needed, as of
> linux-next.
>
Got it. Thanks for the information. Will send v4 latter
Thanks,
Jisheng
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3 1/3] arm: mvebu: add missing of_node_put() to fix reference leak
@ 2013-08-26 10:06 ` Jisheng Zhang
0 siblings, 0 replies; 12+ messages in thread
From: Jisheng Zhang @ 2013-08-26 10:06 UTC (permalink / raw)
To: Thomas Petazzoni
Cc: jason@lakedaemon.net, andrew@lunn.ch,
gregory.clement@free-electrons.com,
ezequiel.garcia@free-electrons.com, mturquette@linaro.org,
sebastian.hesselbarth@gmail.com, linus.walleij@linaro.org,
linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Dear Thomas,
On Mon, 26 Aug 2013 03:02:00 -0700
Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:
> Dear Jisheng Zhang,
>
> On Mon, 26 Aug 2013 17:56:19 +0800, Jisheng Zhang wrote:
>
> > diff --git a/arch/arm/mach-mvebu/armada-370-xp.c
> > b/arch/arm/mach-mvebu/armada-370-xp.c index 97cbb80..8a1ae83 100644
> > --- a/arch/arm/mach-mvebu/armada-370-xp.c
> > +++ b/arch/arm/mach-mvebu/armada-370-xp.c
> > @@ -64,6 +64,7 @@ static void __init armada_370_xp_mbus_init(void)
> > ARMADA_370_XP_MBUS_WINS_SIZE,
> > of_translate_address(dn, &sdram_wins_offs),
> > ARMADA_370_XP_SDRAM_WINS_SIZE);
> > + of_node_put(dn);
> > }
>
> With the integration of Ezequiel patches that add DT support to the
> mvebu-mbus driver, this chunk of the code is no longer needed, as of
> linux-next.
>
Got it. Thanks for the information. Will send v4 latter
Thanks,
Jisheng
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v3 2/3] bus: mvebu: add missing of_node_put() to fix reference leak
2013-08-26 9:56 ` Jisheng Zhang
@ 2013-08-26 9:56 ` Jisheng Zhang
-1 siblings, 0 replies; 12+ messages in thread
From: Jisheng Zhang @ 2013-08-26 9:56 UTC (permalink / raw)
To: linux-arm-kernel
Add of_node_put to properly decrement the refcount when we are
done using a given node.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Reviewed-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
drivers/bus/mvebu-mbus.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
index 33c6947..20da90f 100644
--- a/drivers/bus/mvebu-mbus.c
+++ b/drivers/bus/mvebu-mbus.c
@@ -837,6 +837,7 @@ int __init mvebu_mbus_init(const char *soc, phys_addr_t mbuswins_phys_base,
{
struct mvebu_mbus_state *mbus = &mbus_state;
const struct of_device_id *of_id;
+ struct device_node *np;
int win;
for (of_id = of_mvebu_mbus_ids; of_id->compatible; of_id++)
@@ -860,8 +861,11 @@ int __init mvebu_mbus_init(const char *soc, phys_addr_t mbuswins_phys_base,
return -ENOMEM;
}
- if (of_find_compatible_node(NULL, NULL, "marvell,coherency-fabric"))
+ np = of_find_compatible_node(NULL, NULL, "marvell,coherency-fabric");
+ if (np) {
mbus->hw_io_coherency = 1;
+ of_node_put(np);
+ }
for (win = 0; win < mbus->soc->num_wins; win++)
mvebu_mbus_disable_window(mbus, win);
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v3 2/3] bus: mvebu: add missing of_node_put() to fix reference leak
@ 2013-08-26 9:56 ` Jisheng Zhang
0 siblings, 0 replies; 12+ messages in thread
From: Jisheng Zhang @ 2013-08-26 9:56 UTC (permalink / raw)
To: jszhang, jason, andrew, gregory.clement, thomas.petazzoni,
ezequiel.garcia, mturquette, sebastian.hesselbarth, linus.walleij
Cc: linux, linux-arm-kernel, linux-kernel
Add of_node_put to properly decrement the refcount when we are
done using a given node.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Reviewed-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
drivers/bus/mvebu-mbus.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
index 33c6947..20da90f 100644
--- a/drivers/bus/mvebu-mbus.c
+++ b/drivers/bus/mvebu-mbus.c
@@ -837,6 +837,7 @@ int __init mvebu_mbus_init(const char *soc, phys_addr_t mbuswins_phys_base,
{
struct mvebu_mbus_state *mbus = &mbus_state;
const struct of_device_id *of_id;
+ struct device_node *np;
int win;
for (of_id = of_mvebu_mbus_ids; of_id->compatible; of_id++)
@@ -860,8 +861,11 @@ int __init mvebu_mbus_init(const char *soc, phys_addr_t mbuswins_phys_base,
return -ENOMEM;
}
- if (of_find_compatible_node(NULL, NULL, "marvell,coherency-fabric"))
+ np = of_find_compatible_node(NULL, NULL, "marvell,coherency-fabric");
+ if (np) {
mbus->hw_io_coherency = 1;
+ of_node_put(np);
+ }
for (win = 0; win < mbus->soc->num_wins; win++)
mvebu_mbus_disable_window(mbus, win);
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v3 3/3] pinctrl: mvebu: Convert to use devm_ioremap_resource
2013-08-26 9:56 ` Jisheng Zhang
@ 2013-08-26 9:56 ` Jisheng Zhang
-1 siblings, 0 replies; 12+ messages in thread
From: Jisheng Zhang @ 2013-08-26 9:56 UTC (permalink / raw)
To: linux-arm-kernel
The resource mapped by of_iomap() isn't unmapped in error path. This
patch fixes the resource leakage by using devm_ioremap_resource() instead
of of_iomap().
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Reviewed-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
drivers/pinctrl/mvebu/pinctrl-mvebu.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
index bb7ddb1..1caa45f 100644
--- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c
+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
@@ -579,7 +579,7 @@ static int mvebu_pinctrl_build_functions(struct platform_device *pdev,
int mvebu_pinctrl_probe(struct platform_device *pdev)
{
struct mvebu_pinctrl_soc_info *soc = dev_get_platdata(&pdev->dev);
- struct device_node *np = pdev->dev.of_node;
+ struct resource *res;
struct mvebu_pinctrl *pctl;
void __iomem *base;
struct pinctrl_pin_desc *pdesc;
@@ -591,11 +591,10 @@ int mvebu_pinctrl_probe(struct platform_device *pdev)
return -EINVAL;
}
- base = of_iomap(np, 0);
- if (!base) {
- dev_err(&pdev->dev, "unable to get base address\n");
- return -ENODEV;
- }
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ base = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(base))
+ return PTR_ERR(base);
pctl = devm_kzalloc(&pdev->dev, sizeof(struct mvebu_pinctrl),
GFP_KERNEL);
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v3 3/3] pinctrl: mvebu: Convert to use devm_ioremap_resource
@ 2013-08-26 9:56 ` Jisheng Zhang
0 siblings, 0 replies; 12+ messages in thread
From: Jisheng Zhang @ 2013-08-26 9:56 UTC (permalink / raw)
To: jszhang, jason, andrew, gregory.clement, thomas.petazzoni,
ezequiel.garcia, mturquette, sebastian.hesselbarth, linus.walleij
Cc: linux, linux-arm-kernel, linux-kernel
The resource mapped by of_iomap() isn't unmapped in error path. This
patch fixes the resource leakage by using devm_ioremap_resource() instead
of of_iomap().
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Reviewed-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
drivers/pinctrl/mvebu/pinctrl-mvebu.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
index bb7ddb1..1caa45f 100644
--- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c
+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
@@ -579,7 +579,7 @@ static int mvebu_pinctrl_build_functions(struct platform_device *pdev,
int mvebu_pinctrl_probe(struct platform_device *pdev)
{
struct mvebu_pinctrl_soc_info *soc = dev_get_platdata(&pdev->dev);
- struct device_node *np = pdev->dev.of_node;
+ struct resource *res;
struct mvebu_pinctrl *pctl;
void __iomem *base;
struct pinctrl_pin_desc *pdesc;
@@ -591,11 +591,10 @@ int mvebu_pinctrl_probe(struct platform_device *pdev)
return -EINVAL;
}
- base = of_iomap(np, 0);
- if (!base) {
- dev_err(&pdev->dev, "unable to get base address\n");
- return -ENODEV;
- }
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ base = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(base))
+ return PTR_ERR(base);
pctl = devm_kzalloc(&pdev->dev, sizeof(struct mvebu_pinctrl),
GFP_KERNEL);
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 12+ messages in thread