mfd: sun6i-prcm: fix build warning for non-OF configurations

Message ID 20190416122506.3180853-1-arnd@arndb.de
State New
Headers show
Series
  • mfd: sun6i-prcm: fix build warning for non-OF configurations
Related show

Commit Message

Arnd Bergmann April 16, 2019, 12:24 p.m.
When CONFIG_OF is disabled, we get a harmless warning about an
unused variable:

drivers/mfd/sun6i-prcm.c: In function 'sun6i_prcm_probe':
drivers/mfd/sun6i-prcm.c:151:22: error: unused variable 'np' [-Werror=unused-variable]

Remove the variable and open-code the value in the only place
it is used, so it can get left out as well without CONFIG_OF.

Fixes: a05a2e7998ab ("mfd: sun6i-prcm: Allow to compile with COMPILE_TEST")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 drivers/mfd/sun6i-prcm.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

-- 
2.20.0

Comments

Maxime Ripard April 16, 2019, 12:41 p.m. | #1
On Tue, Apr 16, 2019 at 02:24:59PM +0200, Arnd Bergmann wrote:
> When CONFIG_OF is disabled, we get a harmless warning about an

> unused variable:

>

> drivers/mfd/sun6i-prcm.c: In function 'sun6i_prcm_probe':

> drivers/mfd/sun6i-prcm.c:151:22: error: unused variable 'np' [-Werror=unused-variable]

>

> Remove the variable and open-code the value in the only place

> it is used, so it can get left out as well without CONFIG_OF.

>

> Fixes: a05a2e7998ab ("mfd: sun6i-prcm: Allow to compile with COMPILE_TEST")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>


Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>


Thanks!
Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Lee Jones May 8, 2019, 8:40 a.m. | #2
On Tue, 16 Apr 2019, Arnd Bergmann wrote:

> When CONFIG_OF is disabled, we get a harmless warning about an

> unused variable:

> 

> drivers/mfd/sun6i-prcm.c: In function 'sun6i_prcm_probe':

> drivers/mfd/sun6i-prcm.c:151:22: error: unused variable 'np' [-Werror=unused-variable]

> 

> Remove the variable and open-code the value in the only place

> it is used, so it can get left out as well without CONFIG_OF.

> 

> Fixes: a05a2e7998ab ("mfd: sun6i-prcm: Allow to compile with COMPILE_TEST")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> ---

>  drivers/mfd/sun6i-prcm.c | 3 +--

>  1 file changed, 1 insertion(+), 2 deletions(-)


Applied, thanks.

-- 
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Patch

diff --git a/drivers/mfd/sun6i-prcm.c b/drivers/mfd/sun6i-prcm.c
index 2b658bed47db..2f12a415b807 100644
--- a/drivers/mfd/sun6i-prcm.c
+++ b/drivers/mfd/sun6i-prcm.c
@@ -148,13 +148,12 @@  static const struct of_device_id sun6i_prcm_dt_ids[] = {
 
 static int sun6i_prcm_probe(struct platform_device *pdev)
 {
-	struct device_node *np = pdev->dev.of_node;
 	const struct of_device_id *match;
 	const struct prcm_data *data;
 	struct resource *res;
 	int ret;
 
-	match = of_match_node(sun6i_prcm_dt_ids, np);
+	match = of_match_node(sun6i_prcm_dt_ids, pdev->dev.of_node);
 	if (!match)
 		return -EINVAL;