musb_hdrc: Fix various build warnings for peripheral

(Updated) Fix various build warnings for peripheral-only builds,
and some linewrap bugs.  Remove some inappropriate #ifdefs.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

diff --git a/drivers/usb/musb/musbdefs.h b/drivers/usb/musb/musbdefs.h
index ccc8d24bff3e7c2921ac9e0491be6e6004010d86..58cb188e173bb39a8817d369ab7128a2463cae81 100644 (file)
--- a/drivers/usb/musb/musbdefs.h
+++ b/drivers/usb/musb/musbdefs.h
@@ -328,12 +328,12 @@ struct musb {
        irqreturn_t             (*isr)(int, void *);
        struct work_struct      irq_work;
 
-#ifdef CONFIG_USB_MUSB_HDRC_HCD
-
 /* this hub status bit is reserved by USB 2.0 and not seen by usbcore */
 #define MUSB_PORT_STAT_RESUME  (1 << 31)
 
        u32                     port1_status;
+
+#ifdef CONFIG_USB_MUSB_HDRC_HCD
        unsigned long           rh_timer;
 
        enum musb_h_ep0_state   ep0_stage;

diff --git a/drivers/usb/musb/plat_uds.c b/drivers/usb/musb/plat_uds.c
index dacf930c7ffe65a5753260405c55ae71a6a68382..3984ce5d8334e646bdde3ae1ce745a3f3440321d 100644 (file)
--- a/drivers/usb/musb/plat_uds.c
+++ b/drivers/usb/musb/plat_uds.c
@@ -364,9 +364,7 @@ static irqreturn_t musb_stage0_irq(struct musb * musb, u8 int_usb,
                                u8 devctl, u8 power)
 {
        irqreturn_t handled = IRQ_NONE;
-#ifdef CONFIG_USB_MUSB_HDRC_HCD
        void __iomem *mbase = musb->mregs;
-#endif
 
        DBG(3, "<== Power=%02x, DevCtl=%02x, int_usb=0x%x\n", power, devctl,
                int_usb);
@@ -603,8 +601,7 @@ static irqreturn_t musb_stage0_irq(struct musb * musb, u8 int_usb,
         * only host sees babble; only peripheral sees bus reset.
         */
        if (int_usb & MUSB_INTR_RESET) {
-#ifdef CONFIG_USB_MUSB_HDRC_HCD
-               if (devctl & MUSB_DEVCTL_HM) {
+               if (is_host_capable() && (devctl & MUSB_DEVCTL_HM) != 0) {
                        /*
                         * Looks like non-HS BABBLE can be ignored, but
                         * HS BABBLE is an error condition. For HS the solution
@@ -618,9 +615,7 @@ static irqreturn_t musb_stage0_irq(struct musb * musb, u8 int_usb,
                                ERR("Stopping host session because of babble\n");
                                musb_writeb(mbase, MUSB_DEVCTL, 0);
                        }
-               } else
-#endif /* CONFIG_USB_MUSB_HDRC_HCD */
-               {
+               } else if (is_peripheral_capable()) {
                        DBG(1, "BUS RESET\n");
 
                        musb_g_reset(musb);
@@ -1707,6 +1702,11 @@ musb_vbus_show(struct device *dev, struct device_attribute *attr, char *buf)
 }
 static DEVICE_ATTR(vbus, 0644, musb_vbus_show, musb_vbus_store);
 
+#ifdef CONFIG_USB_GADGET_MUSB_HDRC
+
+/* Gadget drivers can't know that a host is connected so they might want
+ * to start SRP, but users can.  This allows userspace to trigger SRP.
+ */
 static ssize_t
 musb_srp_store(struct device *dev, struct device_attribute *attr,
                const char *buf, size_t n)
@@ -1726,7 +1726,10 @@ musb_srp_store(struct device *dev, struct device_attribute *attr,
        return n;
 }
 static DEVICE_ATTR(srp, 0644, NULL, musb_srp_store);
-#endif
+
+#endif /* CONFIG_USB_GADGET_MUSB_HDRC */
+
+#endif /* sysfs */
 
 /* Only used to provide cable state change events */
 static void musb_irq_work(struct work_struct *data)
@@ -2028,9 +2031,9 @@ fail:
        status = device_create_file(dev, &dev_attr_mode);
        status = device_create_file(dev, &dev_attr_cable);
        status = device_create_file(dev, &dev_attr_vbus);
-#ifdef CONFIG_USB_MUSB_OTG
+#ifdef CONFIG_USB_GADGET_MUSB_HDRC
        status = device_create_file(dev, &dev_attr_srp);
-#endif /* CONFIG_USB_MUSB_OTG */
+#endif /* CONFIG_USB_GADGET_MUSB_HDRC */
        status = 0;
 #endif
 

diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c
index 4b5a4dcae1e54a8dd5af1a3d9f37fdd4ddb76260..d99eeb63d4c8fe67cae90e60aab4b836656d2c15 100644 (file)
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -438,11 +438,9 @@ static void musb_do_idle(unsigned long _musb)
        if (!musb->is_active) {
                u32     wakeups;
 
-#ifdef CONFIG_USB_MUSB_HDRC_HCD
                /* wait until khubd handles port change status */
                if (is_host_active(musb) && (musb->port1_status >> 16))
                        goto done;
-#endif
 
 #ifdef CONFIG_USB_GADGET_MUSB_HDRC
                if (is_peripheral_enabled(musb) && !musb->gadget_driver)
@@ -586,7 +584,6 @@ void musb_platform_set_mode(struct musb *musb, u8 musb_mode)
 {
        void __iomem    *base = musb->ctrl_base;
        u32             otg_stat, phy_otg_ctrl, phy_otg_ena, dev_conf;
-       int             vbus = 0;
 
        if (musb->board_mode != MUSB_OTG) {
                ERR("Changing mode currently only supported in OTG mode\n");
@@ -606,7 +603,6 @@ void musb_platform_set_mode(struct musb *musb, u8 musb_mode)
                phy_otg_ena |= TUSB_PHY_OTG_CTRL_OTG_ID_PULLUP;
                dev_conf |= TUSB_DEV_CONF_ID_SEL;
                dev_conf &= ~TUSB_DEV_CONF_SOFT_ID;
-               vbus = 1;
                break;
 #endif