[[ARM/Tegra] Clean up build warning message

Clean up warning message caused by unused variable and
improper struct type.

Bug 682070

Change-Id: I3409ad22e67252df14d6d14898aa8792a0019574
Reviewed-on: http://git-master/r/8436
Reviewed-by: Lance Zhao <lazhao@nvidia.com>
Tested-by: Lance Zhao <lazhao@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

6 files changed, 6 insertions, 21 deletions

diff --git a/arch/arm/mach-tegra/cpuidle.c b/arch/arm/mach-tegra/cpuidle.c
index 21cb35980a27..b486af44ae9c 100644
--- a/arch/arm/mach-tegra/cpuidle.c
+++ b/arch/arm/mach-tegra/cpuidle.c
@@ -225,7 +225,6 @@ static int tegra_idle_enter(unsigned int cpu)
 static int __init tegra_cpuidle_init(void)
 {
 	unsigned int cpu = smp_processor_id();
-	unsigned int reg;
 	int ret;
 
 	lp2_supported = (num_online_cpus()==1);
diff --git a/arch/arm/mach-tegra/include/nvcommon.h b/arch/arm/mach-tegra/include/nvcommon.h
index 4936555d80a4..8c476f985671 100644
--- a/arch/arm/mach-tegra/include/nvcommon.h
+++ b/arch/arm/mach-tegra/include/nvcommon.h
@@ -29,6 +29,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  */
+#define NV_DEBUG 0
+
 #ifndef INCLUDED_NVCOMMON_H
 #define INCLUDED_NVCOMMON_H
 
diff --git a/arch/arm/mach-tegra/pci-enum.c b/arch/arm/mach-tegra/pci-enum.c
index f9427d8564c7..5d9459953076 100644
--- a/arch/arm/mach-tegra/pci-enum.c
+++ b/arch/arm/mach-tegra/pci-enum.c
@@ -157,23 +157,6 @@ static inline u8 pci_conf_read8(u8 bus, u32 devfn, u32 where)
 	return (u8)temp;
 }
 
-static u16 pci_conf_read16(u8 bus, u32 devfn, u32 where)
-{
-	u32 temp;
-	u32 addr;
-
-	BUG_ON(where & 0x1);
-
-	addr = (u32)pci_tegra_config_addr(bus, devfn, where);
-	pr_err("Issuing pci_conf_read16 at 0x%x\n", addr);
-	temp = readl(addr & ~0x3);
-	temp >>=  8 * (addr & 3);
-	temp &= 0xffff;
-	pr_err("pci_conf_read16 at 0x%x = %d\n", addr, temp);
-
-	return (u16)temp;
-}
-
 static u32 pci_conf_read32(u8 bus, u32 devfn, u32 where)
 {
 	u32 temp;
diff --git a/drivers/rtc/rtc-tegra.c b/drivers/rtc/rtc-tegra.c
index b74f93f14753..68eeaeca5228 100644
--- a/drivers/rtc/rtc-tegra.c
+++ b/drivers/rtc/rtc-tegra.c
@@ -418,7 +418,6 @@ static int tegra_rtc_suspend(struct platform_device *pdev, pm_message_t state)
 static int tegra_rtc_resume(struct platform_device *pdev)
 {
 	struct device *dev=&pdev->dev;
-	unsigned long sl_irq_flags;
 	unsigned int intr_status;
 
 	/* clear */
diff --git a/drivers/serial/tegra_hsuart.c b/drivers/serial/tegra_hsuart.c
index 61ce3dbb9903..941593ef7318 100755
--- a/drivers/serial/tegra_hsuart.c
+++ b/drivers/serial/tegra_hsuart.c
@@ -1124,7 +1124,7 @@ static void tegra_set_baudrate(struct tegra_uart_port *t, unsigned int baud)
 	baud_actual = divisor ? rate / (16 * divisor) : 0;
 	baud_delta = abs(baud_actual - baud);
 	if (WARN_ON(baud_delta * 20 > baud)) {
-		dev_err(t->uport.dev, "requested baud %lu, actual %lu\n", baud, baud_actual);
+		dev_err(t->uport.dev, "requested baud %u, actual %u\n", baud, baud_actual);
 	}
 
 	lcr = t->lcr_shadow;
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c
index ea7d9d6182bb..2e9c9041534e 100644
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/fsl_udc_core.c
@@ -1152,6 +1152,7 @@ static int fsl_get_frame(struct usb_gadget *gadget)
 	return (int)(fsl_readl(&dr_regs->frindex) & USB_FRINDEX_MASKS);
 }
 
+#ifndef CONFIG_USB_ANDROID
 /*-----------------------------------------------------------------------
  * Tries to wake up the host connected to this gadget
  -----------------------------------------------------------------------*/
@@ -1173,6 +1174,7 @@ static int fsl_wakeup(struct usb_gadget *gadget)
 	fsl_writel(portsc, &dr_regs->portsc1);
 	return 0;
 }
+#endif
 
 static int can_pullup(struct fsl_udc *udc)
 {
@@ -1979,7 +1981,7 @@ static void reset_irq(struct fsl_udc *udc)
  */
 static void fsl_udc_charger_detection(struct work_struct* work)
 {
-	struct fsl_udc *udc = container_of (work, struct fsl_udc, work);
+	struct fsl_udc *udc = container_of (work, struct fsl_udc, work.work);
 
 	/* check for the platform charger detection */
 	if (platform_udc_charger_detection()) {