renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-05 11:54:01 +08:00
Code

clk: sunxi: "cpu_data" is defined in header files of some architectures

Browse Source 
In some architectures, the #define cpu_data is not a "macro-function",
so the compiler will substitute the identifier with probably something
wrong.

Signed-off-by: Giacomo A. Catenazzi <cate@cateee.net>
Signed-off-by: Emilio López <emilio@elopez.com.ar>
[emilio@elopez.com.ar: use cpu_mux_data instead of this_cpu_data]
Signed-off-by: Mike Turquette <mturquette@linaro.org>
This commit is contained in:
Giacomo A. Catenazzi 2013-05-17 10:43:20 -03:00 committed by Mike Turquette
parent 0e56523fd7
commit 61fd58dc57
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/clk/sunxi/clk-sunxi.c
View File

@ -239,7 +239,7 @@ struct mux_data {
u8 shift;
};
static const __initconst struct mux_data cpu_data = {
static const __initconst struct mux_data cpu_mux_data = {
.shift = 16,
};
@ -433,7 +433,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 = &cpu_mux_data,},
{.compatible = "allwinner,sun4i-apb1-mux-clk", .data = &apb1_mux_data,},
{}
};