ENGR00251209-3 usb: fix below build warning

/home/b29397/work/projects/linux-2.6-imx/arch/arm/mach-mx6/usb_dr.c:
In function 'mx6_usb_dr_init':
/home/b29397/work/projects/linux-2.6-imx/arch/arm/mach-mx6/usb_dr.c:
615: warning: unused variable 'imx6q_mxc_ehci_otg_data'
/home/b29397/work/projects/linux-2.6-imx/arch/arm/mach-mx6/usb_dr.c:
At top level:
/home/b29397/work/projects/linux-2.6-imx/arch/arm/mach-mx6/usb_dr.c:
77: warning: 'fsl_platform_otg_set_usb_phy_dis' defined but not used

Signed-off-by: Peter Chen <peter.chen@freescale.com>

diff --git a/arch/arm/mach-mx6/usb_dr.c b/arch/arm/mach-mx6/usb_dr.c
index 8f909321e219bb54d89c420eeee7e2c815472028..efae4aef6d23261166a497ed9b232881a414b7c2 100644 (file)
--- a/arch/arm/mach-mx6/usb_dr.c
+++ b/arch/arm/mach-mx6/usb_dr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -74,51 +74,6 @@ static struct fsl_usb2_wakeup_platform_data dr_wakeup_config = {
        .usb_wakeup_exhandle = usbotg_wakeup_event_clear,
 };
 
-static void fsl_platform_otg_set_usb_phy_dis(
-               struct fsl_usb2_platform_data *pdata, bool enable)
-{
-       u32 usb_phy_ctrl_dcdt = 0;
-       void __iomem *anatop_base_addr = MX6_IO_ADDRESS(ANATOP_BASE_ADDR);
-       usb_phy_ctrl_dcdt = __raw_readl(
-                       MX6_IO_ADDRESS(pdata->phy_regs) + HW_USBPHY_CTRL) &
-                       BM_USBPHY_CTRL_ENHOSTDISCONDETECT;
-       if (enable) {
-               if (usb_phy_ctrl_dcdt == 0) {
-                       __raw_writel(BM_ANADIG_USB1_PLL_480_CTRL_EN_USB_CLKS,
-                                       anatop_base_addr + HW_ANADIG_USB1_PLL_480_CTRL_CLR);
-
-                       __raw_writel(BM_USBPHY_PWD_RXPWDENV,
-                                       MX6_IO_ADDRESS(pdata->phy_regs) + HW_USBPHY_PWD_SET);
-
-                       udelay(300);
-
-                       __raw_writel(BM_USBPHY_CTRL_ENHOSTDISCONDETECT,
-                               MX6_IO_ADDRESS(pdata->phy_regs)
-                               + HW_USBPHY_CTRL_SET);
-
-                       UOG_USBSTS |= (1 << 7);
-
-                       while ((UOG_USBSTS & (1 << 7)) == 0)
-                               ;
-
-                       udelay(2);
-
-                       __raw_writel(BM_USBPHY_PWD_RXPWDENV,
-                                       MX6_IO_ADDRESS(pdata->phy_regs) + HW_USBPHY_PWD_CLR);
-
-                       __raw_writel(BM_ANADIG_USB1_PLL_480_CTRL_EN_USB_CLKS,
-                                       anatop_base_addr + HW_ANADIG_USB1_PLL_480_CTRL_SET);
-
-               }
-       } else {
-               if (usb_phy_ctrl_dcdt
-                               == BM_USBPHY_CTRL_ENHOSTDISCONDETECT)
-                       __raw_writel(BM_USBPHY_CTRL_ENHOSTDISCONDETECT,
-                               MX6_IO_ADDRESS(pdata->phy_regs)
-                               + HW_USBPHY_CTRL_CLR);
-       }
-}
-
 static void usbotg_internal_phy_clock_gate(bool on)
 {
        void __iomem *phy_reg = MX6_IO_ADDRESS(USB_PHY0_BASE_ADDR);
@@ -387,6 +342,51 @@ static void usbotg_wakeup_event_clear(void)
 
 #ifdef CONFIG_USB_EHCI_ARC_OTG
 /* Beginning of host related operation for DR port */
+static void fsl_platform_otg_set_usb_phy_dis(
+               struct fsl_usb2_platform_data *pdata, bool enable)
+{
+       u32 usb_phy_ctrl_dcdt = 0;
+       void __iomem *anatop_base_addr = MX6_IO_ADDRESS(ANATOP_BASE_ADDR);
+       usb_phy_ctrl_dcdt = __raw_readl(
+                       MX6_IO_ADDRESS(pdata->phy_regs) + HW_USBPHY_CTRL) &
+                       BM_USBPHY_CTRL_ENHOSTDISCONDETECT;
+       if (enable) {
+               if (usb_phy_ctrl_dcdt == 0) {
+                       __raw_writel(BM_ANADIG_USB1_PLL_480_CTRL_EN_USB_CLKS,
+                                       anatop_base_addr + HW_ANADIG_USB1_PLL_480_CTRL_CLR);
+
+                       __raw_writel(BM_USBPHY_PWD_RXPWDENV,
+                                       MX6_IO_ADDRESS(pdata->phy_regs) + HW_USBPHY_PWD_SET);
+
+                       udelay(300);
+
+                       __raw_writel(BM_USBPHY_CTRL_ENHOSTDISCONDETECT,
+                               MX6_IO_ADDRESS(pdata->phy_regs)
+                               + HW_USBPHY_CTRL_SET);
+
+                       UOG_USBSTS |= (1 << 7);
+
+                       while ((UOG_USBSTS & (1 << 7)) == 0)
+                               ;
+
+                       udelay(2);
+
+                       __raw_writel(BM_USBPHY_PWD_RXPWDENV,
+                                       MX6_IO_ADDRESS(pdata->phy_regs) + HW_USBPHY_PWD_CLR);
+
+                       __raw_writel(BM_ANADIG_USB1_PLL_480_CTRL_EN_USB_CLKS,
+                                       anatop_base_addr + HW_ANADIG_USB1_PLL_480_CTRL_SET);
+
+               }
+       } else {
+               if (usb_phy_ctrl_dcdt
+                               == BM_USBPHY_CTRL_ENHOSTDISCONDETECT)
+                       __raw_writel(BM_USBPHY_CTRL_ENHOSTDISCONDETECT,
+                               MX6_IO_ADDRESS(pdata->phy_regs)
+                               + HW_USBPHY_CTRL_CLR);
+       }
+}
+
 static void _host_platform_rh_suspend_swfix(struct fsl_usb2_platform_data *pdata)
 {
        void __iomem *phy_reg = MX6_IO_ADDRESS(USB_PHY0_BASE_ADDR);
@@ -612,11 +612,11 @@ static int  __init mx6_usb_dr_init(void)
        void __iomem *anatop_base_addr = MX6_IO_ADDRESS(ANATOP_BASE_ADDR);
        struct imx_fsl_usb2_wakeup_data imx6q_fsl_otg_wakeup_data =
                imx_fsl_usb2_wakeup_data_entry_single(MX6Q, 0, OTG);
-       struct imx_mxc_ehci_data imx6q_mxc_ehci_otg_data =
+       struct imx_mxc_ehci_data __maybe_unused imx6q_mxc_ehci_otg_data =
                imx_mxc_ehci_data_entry_single(MX6Q, 0, OTG);
-       struct imx_fsl_usb2_udc_data imx6q_fsl_usb2_udc_data =
+       struct imx_fsl_usb2_udc_data __maybe_unused imx6q_fsl_usb2_udc_data =
                imx_fsl_usb2_udc_data_entry_single(MX6Q);
-       struct imx_fsl_usb2_otg_data imx6q_fsl_usb2_otg_data  =
+       struct imx_fsl_usb2_otg_data __maybe_unused imx6q_fsl_usb2_otg_data  =
                imx_fsl_usb2_otg_data_entry_single(MX6Q);
 
        /* Some phy and power's special controls for otg