7 files changed, 12 insertions, 12 deletions

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index e1282328fc27..9d7fc9a39933 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -2352,7 +2352,7 @@ static int usb_hcd_request_irqs(struct usb_hcd *hcd,
                                         "io mem" : "io base",
                                         (unsigned long long)hcd->rsrc_start);
         } else {
-                hcd->irq = -1;
+                hcd->irq = 0;
                 if (hcd->rsrc_start)
                         dev_info(hcd->self.controller, "%s 0x%08llx\n",
                                         (hcd->driver->flags & HCD_MEMORY) ?
@@ -2508,7 +2508,7 @@ err_register_root_hub:
         clear_bit(HCD_FLAG_POLL_RH, &hcd->flags);
         del_timer_sync(&hcd->rh_timer);
 err_hcd_driver_start:
-        if (usb_hcd_is_primary_hcd(hcd) && hcd->irq >= 0)
+        if (usb_hcd_is_primary_hcd(hcd) && hcd->irq > 0)
                 free_irq(irqnum, hcd);
 err_request_irq:
 err_hcd_driver_setup:
@@ -2573,7 +2573,7 @@ void usb_remove_hcd(struct usb_hcd *hcd)
         del_timer_sync(&hcd->rh_timer);
 
         if (usb_hcd_is_primary_hcd(hcd)) {
-                if (hcd->irq >= 0)
+                if (hcd->irq > 0)
                         free_irq(hcd->irq, hcd);
         }
 
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 34b9edd86651..831fa40c609a 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -899,7 +899,7 @@ static void ohci_stop (struct usb_hcd *hcd)
         ohci_usb_reset (ohci);
         ohci_writel (ohci, OHCI_INTR_MIE, &ohci->regs->intrdisable);
         free_irq(hcd->irq, hcd);
-        hcd->irq = -1;
+        hcd->irq = 0;
 
         if (quirk_zfmicro(ohci))
                 del_timer(&ohci->unlink_watchdog);
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 3a033240ec64..9e71f7c46a85 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -2396,7 +2396,7 @@ hw_died:
         /* FIXME when MSI-X is supported and there are multiple vectors */
         /* Clear the MSI-X event interrupt status */
 
-        if (hcd->irq != -1) {
+        if (hcd->irq) {
                 u32 irq_pending;
                 /* Acknowledge the PCI interrupt */
                 irq_pending = xhci_readl(xhci, &xhci->ir_set->irq_pending);
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index c939f5fdef9e..a629ad860329 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -224,13 +224,13 @@ static void xhci_free_irq(struct xhci_hcd *xhci)
         int ret;
 
         /* return if using legacy interrupt */
-        if (xhci_to_hcd(xhci)->irq >= 0)
+        if (xhci_to_hcd(xhci)->irq > 0)
                 return;
 
         ret = xhci_free_msi(xhci);
         if (!ret)
                 return;
-        if (pdev->irq >= 0)
+        if (pdev->irq > 0)
                 free_irq(pdev->irq, xhci_to_hcd(xhci));
 
         return;
@@ -341,7 +341,7 @@ static int xhci_try_enable_msi(struct usb_hcd *hcd)
         /* unregister the legacy interrupt */
         if (hcd->irq)
                 free_irq(hcd->irq, hcd);
-        hcd->irq = -1;
+        hcd->irq = 0;
 
         ret = xhci_setup_msix(xhci);
         if (ret)
@@ -349,7 +349,7 @@ static int xhci_try_enable_msi(struct usb_hcd *hcd)
                 ret = xhci_setup_msi(xhci);
 
         if (!ret)
-                /* hcd->irq is -1, we have MSI */
+                /* hcd->irq is 0, we have MSI */
                 return 0;
 
         if (!pdev->irq) {
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index b527e9e6dbac..0f8b82918a40 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1987,7 +1987,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
                 musb->xceiv->otg->default_a = 1;
                 musb->xceiv->state = OTG_STATE_A_IDLE;
 
-                status = usb_add_hcd(musb_to_hcd(musb), -1, 0);
+                status = usb_add_hcd(musb_to_hcd(musb), 0, 0);
 
                 hcd->self.uses_pio_for_control = 1;
                 dev_dbg(musb->controller, "%s mode, status %d, devctl %02x %c\n",
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index a495a3079c07..f42c29b11f71 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1957,7 +1957,7 @@ static int musb_gadget_start(struct usb_gadget *g,
                  * handles power budgeting ... this way also
                  * ensures HdrcStart is indirectly called.
                  */
-                retval = usb_add_hcd(musb_to_hcd(musb), -1, 0);
+                retval = usb_add_hcd(musb_to_hcd(musb), 0, 0);
                 if (retval < 0) {
                         dev_dbg(musb->controller, "add_hcd failed, %d\n", retval);
                         goto err2;
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index 2e6071efbfb7..5de415707c23 100644
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -127,7 +127,7 @@ struct usb_hcd {
         unsigned                authorized_default:1;
         unsigned                has_tt:1;       /* Integrated TT in root hub */
 
-        int                     irq;            /* irq allocated */
+        unsigned int            irq;            /* irq allocated */
         void __iomem            *regs;          /* device memory/io */
         u64                     rsrc_start;     /* memory/io resource start */
         u64                     rsrc_len;       /* memory/io resource length */