diff options
author | Alex Shi <alex.shi@intel.com> | 2013-05-23 22:54:19 -0400 |
---|---|---|
committer | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2013-06-05 19:45:33 -0400 |
commit | 851ec164b14aa9dacafd6edb099e76a4cc9d06ec (patch) | |
tree | 6f6d30981508373c9e93d18af07bc946ecf799e2 /drivers | |
parent | 01c5f4477d527732ecaf92d9b3d2201c8030000b (diff) |
usb/xhci: unify parameter of xhci_msi_irq
According to Felipe and Alan's comments the second parameter of irq
handler should be 'void *' not a specific structure pointer.
So change it.
Signed-off-by: Alex Shi <alex.shi@intel.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/host/xhci-ring.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/xhci.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/xhci.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 1969c001b3f9..e02b90746e84 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c | |||
@@ -2799,7 +2799,7 @@ hw_died: | |||
2799 | return IRQ_HANDLED; | 2799 | return IRQ_HANDLED; |
2800 | } | 2800 | } |
2801 | 2801 | ||
2802 | irqreturn_t xhci_msi_irq(int irq, struct usb_hcd *hcd) | 2802 | irqreturn_t xhci_msi_irq(int irq, void *hcd) |
2803 | { | 2803 | { |
2804 | return xhci_irq(hcd); | 2804 | return xhci_irq(hcd); |
2805 | } | 2805 | } |
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 9e72caf2570a..4a05555bf6e3 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c | |||
@@ -218,7 +218,7 @@ static int xhci_setup_msi(struct xhci_hcd *xhci) | |||
218 | return ret; | 218 | return ret; |
219 | } | 219 | } |
220 | 220 | ||
221 | ret = request_irq(pdev->irq, (irq_handler_t)xhci_msi_irq, | 221 | ret = request_irq(pdev->irq, xhci_msi_irq, |
222 | 0, "xhci_hcd", xhci_to_hcd(xhci)); | 222 | 0, "xhci_hcd", xhci_to_hcd(xhci)); |
223 | if (ret) { | 223 | if (ret) { |
224 | xhci_dbg(xhci, "disable MSI interrupt\n"); | 224 | xhci_dbg(xhci, "disable MSI interrupt\n"); |
@@ -290,7 +290,7 @@ static int xhci_setup_msix(struct xhci_hcd *xhci) | |||
290 | 290 | ||
291 | for (i = 0; i < xhci->msix_count; i++) { | 291 | for (i = 0; i < xhci->msix_count; i++) { |
292 | ret = request_irq(xhci->msix_entries[i].vector, | 292 | ret = request_irq(xhci->msix_entries[i].vector, |
293 | (irq_handler_t)xhci_msi_irq, | 293 | xhci_msi_irq, |
294 | 0, "xhci_hcd", xhci_to_hcd(xhci)); | 294 | 0, "xhci_hcd", xhci_to_hcd(xhci)); |
295 | if (ret) | 295 | if (ret) |
296 | goto disable_msix; | 296 | goto disable_msix; |
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index 3ee79d6fddae..d62ebca1e91c 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h | |||
@@ -1746,7 +1746,7 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated); | |||
1746 | 1746 | ||
1747 | int xhci_get_frame(struct usb_hcd *hcd); | 1747 | int xhci_get_frame(struct usb_hcd *hcd); |
1748 | irqreturn_t xhci_irq(struct usb_hcd *hcd); | 1748 | irqreturn_t xhci_irq(struct usb_hcd *hcd); |
1749 | irqreturn_t xhci_msi_irq(int irq, struct usb_hcd *hcd); | 1749 | irqreturn_t xhci_msi_irq(int irq, void *hcd); |
1750 | int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev); | 1750 | int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev); |
1751 | void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev); | 1751 | void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev); |
1752 | int xhci_alloc_tt_info(struct xhci_hcd *xhci, | 1752 | int xhci_alloc_tt_info(struct xhci_hcd *xhci, |