[PATCH] ARM: OMAP2: Cleanup various compile warnings.

The current tree is a bit noisy when it comes to OMAP2 builds, here's a
couple of trivial patches to shut up gcc.

diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index 2387ab9ef2c989ecab5aa35d95c407dc16bbc867..74c05240639ef4c67a48f66c681cded4c3f5f748 100644 (file)
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -913,7 +913,7 @@ static int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
 static int omap2_select_table_rate(struct clk * clk, unsigned long rate)
 {
        u32 flags, cur_rate, done_rate, bypass = 0;
-       u8 cpu_mask;
+       u8 cpu_mask = 0;
        struct prcm_config *prcm;
        unsigned long found_speed = 0;
 
@@ -929,7 +929,7 @@ static int omap2_select_table_rate(struct clk * clk, unsigned long rate)
        for (prcm = rate_table; prcm->mpu_speed; prcm++) {
                if (!(prcm->flags & cpu_mask))
                        continue;
-                       
+
                if (prcm->xtal_speed != sys_ck.rate)
                        continue;
 
@@ -941,7 +941,7 @@ static int omap2_select_table_rate(struct clk * clk, unsigned long rate)
 
        if (!found_speed) {
                printk(KERN_INFO "Could not set MPU rate to %luMHz\n",
-                      rate / 1000000); 
+        rate / 1000000);
                return -EINVAL;
        }
 

diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h
index 5aa0040c8ca7d5c22e7cd75216399efe31713699..48d2888579fc9a284599f855de22fc7055771368 100644 (file)
--- a/arch/arm/mach-omap2/clock.h
+++ b/arch/arm/mach-omap2/clock.h
@@ -17,9 +17,6 @@
 #ifndef __ARCH_ARM_MACH_OMAP2_CLOCK_H
 #define __ARCH_ARM_MACH_OMAP2_CLOCK_H
 
-/* FIXME: This will go away when the cpu detection is done for 24xx */
-#define cpu_is_omap2430()      0
-
 static void omap2_sys_clk_recalc(struct clk * clk);
 static void omap2_clksel_recalc(struct clk * clk);
 static void omap2_followparent_recalc(struct clk * clk);

diff --git a/arch/arm/plat-omap/usb.c b/arch/arm/plat-omap/usb.c
index 687779a57a350a49832b37ab13b2e3a2999b4609..517131112c266ebed8862f85dc2302d60c8ae5c8 100644 (file)
--- a/arch/arm/plat-omap/usb.c
+++ b/arch/arm/plat-omap/usb.c
@@ -91,6 +91,8 @@ EXPORT_SYMBOL(otg_set_transceiver);
 
 /*-------------------------------------------------------------------------*/
 
+#if defined(CONFIG_ARCH_OMAP_OTG) || defined(CONFIG_ARCH_OMAP15XX)
+
 static u32 __init omap_usb0_init(unsigned nwires, unsigned is_device)
 {
        u32     syscon1 = 0;
@@ -271,6 +273,8 @@ static u32 __init omap_usb2_init(unsigned nwires, unsigned alt_pingroup)
        return syscon1 << 24;
 }
 
+#endif
+
 /*-------------------------------------------------------------------------*/
 
 #if    defined(CONFIG_USB_GADGET_OMAP) || \