diff options
| author | Lily Zhang <r58066@freescale.com> | 2011-06-14 20:26:06 +0800 |
|---|---|---|
| committer | Lily Zhang <r58066@freescale.com> | 2011-06-14 20:45:41 +0800 |
| commit | 1c6467d5c32be3b615e1c716a3e5e6edb5826bba (patch) | |
| tree | 2e8ceea59d9f59d04cc03e3f1b35a76ab0bb9da4 /arch | |
| parent | caa2bbbf637bf1656dae705de027b48e939e8705 (diff) | |
ENGR00151476-1 mx5: remove build warning message
Remove build warning message for mx5 platform
Signed-off-by: Lily Zhang <r58066@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mx5/clock.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx5/mx50_arm2.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-mx5/mx50_rdp_pmic_mc34708.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx5/system.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-mx5/clock.c b/arch/arm/mach-mx5/clock.c index c051fd80488f..91760306e459 100644 --- a/arch/arm/mach-mx5/clock.c +++ b/arch/arm/mach-mx5/clock.c @@ -4041,7 +4041,7 @@ static struct clk sahara_clk[] = { .secondary = &sahara_clk[2], }, { - .parent = &scc_clk, + .parent = &scc_clk[0], .secondary = &emi_fast_clk, } }; diff --git a/arch/arm/mach-mx5/mx50_arm2.c b/arch/arm/mach-mx5/mx50_arm2.c index 6cf06aa45b3c..c7680f9e3f15 100644 --- a/arch/arm/mach-mx5/mx50_arm2.c +++ b/arch/arm/mach-mx5/mx50_arm2.c @@ -605,7 +605,7 @@ static struct regulator_init_data max17135_init_data[] __initdata = { }, }; -static void epdc_get_pins(void) +static int epdc_get_pins(void) { /* Claim GPIOs for EPDC pins - used during power up/down */ gpio_request(EPDC_D0, "epdc_d0"); @@ -628,6 +628,7 @@ static void epdc_get_pins(void) gpio_request(EPDC_SDCE0, "epdc_sdce0"); gpio_request(EPDC_SDCE1, "epdc_sdce1"); gpio_request(EPDC_SDCE2, "epdc_sdce2"); + return 0; } static void epdc_put_pins(void) diff --git a/arch/arm/mach-mx5/mx50_rdp_pmic_mc34708.c b/arch/arm/mach-mx5/mx50_rdp_pmic_mc34708.c index 3bd96520fbe2..23b294c603f8 100644 --- a/arch/arm/mach-mx5/mx50_rdp_pmic_mc34708.c +++ b/arch/arm/mach-mx5/mx50_rdp_pmic_mc34708.c @@ -259,7 +259,7 @@ static struct regulator_init_data vgen2_init = { static int mc34708_regulator_init(struct mc34708 *mc34708) { - unsigned int value, register_mask; + unsigned int value; pmic_read_reg(REG_MC34708_IDENTIFICATION, &value, 0xffffff); pr_info("PMIC MC34708 ID:0x%x\n", value); diff --git a/arch/arm/mach-mx5/system.c b/arch/arm/mach-mx5/system.c index ab8636051c22..8275fc957aa2 100644 --- a/arch/arm/mach-mx5/system.c +++ b/arch/arm/mach-mx5/system.c @@ -310,7 +310,7 @@ static int __mxs_reset_block(void __iomem *hwreg, int just_enable) int mxs_reset_block(void __iomem *hwreg, int just_enable) { int try = 10; - int r; + int r = 0; while (try--) { r = __mxs_reset_block(hwreg, just_enable); |