[PATCH] drivers/clk/sunxi/clk-sunxi.c: small improvement of code

From: Giacomo Catenazzi
Date: Fri May 17 2013 - 03:07:59 EST


Hello Emilio,

please apply the following patch: "cpu_data" is defined in a header files of architectures.
In some architecture, the #define cpu_data is not a "macro-function", so the compiler will substitute the identifier with probably something wrong.


--- a/drivers/clk/sunxi/clk-sunxi.c
+++ b/drivers/clk/sunxi/clk-sunxi.c
@@ -239,7 +239,7 @@ struct mux_data {
u8 shift;
};

-static const __initconst struct mux_data cpu_data = {
+static const __initconst struct mux_data this_cpu_data = {
.shift = 16,
};

@@ -421,7 +421,7 @@ static const __initconst struct of_device_id clk_div_match[] = {

/* Matches for mux clocks */
static const __initconst struct of_device_id clk_mux_match[] = {
- {.compatible = "allwinner,sun4i-cpu-clk", .data = &cpu_data,},
+ {.compatible = "allwinner,sun4i-cpu-clk", .data = &this_cpu_data,},
{.compatible = "allwinner,sun4i-apb1-mux-clk", .data = &apb1_mux_data,},
{}
};



Signed-off-by: Giacomo A. Catenazzi <cate@xxxxxxxxxx>

ciao
cate
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/