arm: tegra: resolve compilation time warnings
Sanjay Singh Rawat [Thu, 7 Jun 2012 09:33:14 +0000 (14:33 +0530)]
Bug 949219

Change-Id: I91a67d30869e9800c483f112d58b9f76e2dbe361
Signed-off-by: Sanjay Singh Rawat <srawat@nvidia.com>
Reviewed-on: http://git-master/r/103534
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>

Conflicts:

arch/arm/mach-tegra/pcie.c

Rebase-Id: Ra2f3484ab72c9477ec2cd646a86f4042e3826d48

arch/arm/mach-tegra/cpu-tegra3.c
arch/arm/mach-tegra/tegra3_usb_phy.c

index 58cb66c..39ab267 100644 (file)
@@ -302,7 +302,7 @@ static int min_cpus_notify(struct notifier_block *nb, unsigned long n, void *p)
 
        if ((n >= 1) && is_lp_cluster()) {
                /* make sure cpu rate is within g-mode range before switching */
-               unsigned int speed = max((unsigned long)tegra_getspeed(0), 
+               unsigned int speed = max((unsigned long)tegra_getspeed(0),
                        clk_get_min_rate(cpu_g_clk) / 1000);
                tegra_update_cpu_speed(speed);
 
index 15809df..9bddc01 100644 (file)
@@ -892,6 +892,7 @@ static void uhsic_powerup_pmc_wake_detect(struct tegra_usb_phy *phy)
        mdelay(1);
 }
 
+#ifdef KERNEL_WARNING
 static void usb_phy_power_down_pmc(void)
 {
        unsigned long val;
@@ -935,6 +936,7 @@ static void usb_phy_power_down_pmc(void)
        UHSIC_MASTER_ENABLE_P0;
        writel(val, pmc_base + PMC_SLEEP_CFG);
 }
+#endif
 
 static int usb_phy_bringup_host_controller(struct tegra_usb_phy *phy)
 {