Skip to contentSkip to conversation

clk: efm32: fix build warning

PATCH New Arnd Bergmann 3 participants 4 messages Sep 8, 2014 – Sep 9, 2014 Common clk

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 clk: efm32: fix build warning

The normal prototype for of clk init functions is to return void, while efm32gg_cmu_init return an int, resulting in this harmless build warning:

drivers/clk/clk-efm32gg.c:81:189: warning: comparison of distinct pointer types lacks a cast [enabled by default]
CLK_OF_DECLARE(efm32ggcmu, "efm32gg,cmu", efm32gg_cmu_init);

This changes the return type to avoid the warning.

drivers/clk/clk-efm32gg.c +3 -3
index bac2ddf49d02..73a8d0ff530c 100644
@@ -22,7 +22,7 @@ static struct clk_onecell_data clk_data = {
 	.clk_num = ARRAY_SIZE(clk),
 };
 
-static int __init efm32gg_cmu_init(struct device_node *np)
+static void __init efm32gg_cmu_init(struct device_node *np)
 {
 	int i;
 	void __iomem *base;
@@ -33,7 +33,7 @@ static int __init efm32gg_cmu_init(struct device_node *np)
 	base = of_iomap(np, 0);
 	if (!base) {
 		pr_warn("Failed to map address range for efm32gg,cmu node\n");
-		return -EADDRNOTAVAIL;
+		return;
 	}
 
 	clk[clk_HFXO] = clk_register_fixed_rate(NULL, "HFXO", NULL,
@@ -76,6 +76,6 @@ static int __init efm32gg_cmu_init(struct device_node *np)
 	clk[clk_HFPERCLKDAC0] = clk_register_gate(NULL, "HFPERCLK.DAC0",
 			"HFXO", 0, base + CMU_HFPERCLKEN0, 17, 0, NULL);
 
-	return of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
+	of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
 }
 CLK_OF_DECLARE(efm32ggcmu, "efm32gg,cmu", efm32gg_cmu_init);
#1 lore raw

PATCH 1/1 clk: efm32: fix build warning

Quoted 10 lines · Arnd Bergmann

The normal prototype for of clk init functions is to return void, while efm32gg_cmu_init return an int, resulting in this harmless build warning:

drivers/clk/clk-efm32gg.c:81:189: warning: comparison of distinct pointer types lacks a cast [enabled by default]
CLK_OF_DECLARE(efm32ggcmu, "efm32gg,cmu", efm32gg_cmu_init);

This changes the return type to avoid the warning.

I already sent the exact same patch some time ago, even the sha1 sums in the diff match.

	Subject: [PATCH] clk/efm32gg: fix dt init prototype
	Message-Id: <[email protected]>
	Date: Mon, 28 Jul 2014 16:38:21 +0200

Thanks
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#2 lore raw

PATCH 1/1 clk: efm32: fix build warning

Quoted 10 lines · On Monday 08 September 2014 19:48:05 Uwe Kleine-K?nig wrote:
Quoted 9 lines · Arnd Bergmann

The normal prototype for of clk init functions is to return void, while efm32gg_cmu_init return an int, resulting in this harmless build warning:

drivers/clk/clk-efm32gg.c:81:189: warning: comparison of distinct pointer types lacks a cast [enabled by default]
CLK_OF_DECLARE(efm32ggcmu, "efm32gg,cmu", efm32gg_cmu_init);

This changes the return type to avoid the warning.

Quoted 8 lines
Quoted 1 line

I already sent the exact same patch some time ago, even the sha1 sums in the diff match.

        Subject: [PATCH] clk/efm32gg: fix dt init prototype
        Message-Id: <[email protected]>
        Date: Mon, 28 Jul 2014 16:38:21 +0200

Ok, good to see that we came to the same conclusion.

Mike, could you please try to get Uwe's patch into 3.17?

Arnd

#3 lore raw

PATCH 1/1 clk: efm32: fix build warning

Quoting Arnd Bergmann (2014-09-08 11:18:57)

Quoted 15 lines · On Monday 08 September 2014 19:48:05 Uwe Kleine-K?nig wrote:
Quoted 14 lines · Arnd Bergmann
Quoted 10 lines

The normal prototype for of clk init functions is to return void, while efm32gg_cmu_init return an int, resulting in this harmless build warning:

drivers/clk/clk-efm32gg.c:81:189: warning: comparison of distinct pointer types lacks a cast [enabled by default]
CLK_OF_DECLARE(efm32ggcmu, "efm32gg,cmu", efm32gg_cmu_init);

This changes the return type to avoid the warning.

I already sent the exact same patch some time ago, even the sha1 sums in the diff match.

Quoted 8 lines
Quoted 4 lines
        Subject: [PATCH] clk/efm32gg: fix dt init prototype
        Message-Id: <[email protected]>
        Date: Mon, 28 Jul 2014 16:38:21 +0200

Ok, good to see that we came to the same conclusion.

Mike, could you please try to get Uwe's patch into 3.17?

Done. Added your reviewed-by tag as well.

Regards,
Mike

Quoted 2 lines

Arnd