提交 851ec164 编写于 作者: A Alex Shi 提交者: Sarah Sharp

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: NAlex Shi <alex.shi@intel.com>
Acked-by: NFelipe Balbi <balbi@ti.com>
Signed-off-by: NSarah Sharp <sarah.a.sharp@linux.intel.com>
上级 01c5f447
...@@ -2799,7 +2799,7 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd) ...@@ -2799,7 +2799,7 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
irqreturn_t xhci_msi_irq(int irq, struct usb_hcd *hcd) irqreturn_t xhci_msi_irq(int irq, void *hcd)
{ {
return xhci_irq(hcd); return xhci_irq(hcd);
} }
......
...@@ -218,7 +218,7 @@ static int xhci_setup_msi(struct xhci_hcd *xhci) ...@@ -218,7 +218,7 @@ static int xhci_setup_msi(struct xhci_hcd *xhci)
return ret; return ret;
} }
ret = request_irq(pdev->irq, (irq_handler_t)xhci_msi_irq, ret = request_irq(pdev->irq, xhci_msi_irq,
0, "xhci_hcd", xhci_to_hcd(xhci)); 0, "xhci_hcd", xhci_to_hcd(xhci));
if (ret) { if (ret) {
xhci_dbg(xhci, "disable MSI interrupt\n"); xhci_dbg(xhci, "disable MSI interrupt\n");
...@@ -290,7 +290,7 @@ static int xhci_setup_msix(struct xhci_hcd *xhci) ...@@ -290,7 +290,7 @@ static int xhci_setup_msix(struct xhci_hcd *xhci)
for (i = 0; i < xhci->msix_count; i++) { for (i = 0; i < xhci->msix_count; i++) {
ret = request_irq(xhci->msix_entries[i].vector, ret = request_irq(xhci->msix_entries[i].vector,
(irq_handler_t)xhci_msi_irq, xhci_msi_irq,
0, "xhci_hcd", xhci_to_hcd(xhci)); 0, "xhci_hcd", xhci_to_hcd(xhci));
if (ret) if (ret)
goto disable_msix; goto disable_msix;
......
...@@ -1746,7 +1746,7 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated); ...@@ -1746,7 +1746,7 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated);
int xhci_get_frame(struct usb_hcd *hcd); int xhci_get_frame(struct usb_hcd *hcd);
irqreturn_t xhci_irq(struct usb_hcd *hcd); irqreturn_t xhci_irq(struct usb_hcd *hcd);
irqreturn_t xhci_msi_irq(int irq, struct usb_hcd *hcd); irqreturn_t xhci_msi_irq(int irq, void *hcd);
int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev); int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev);
void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev); void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev);
int xhci_alloc_tt_info(struct xhci_hcd *xhci, int xhci_alloc_tt_info(struct xhci_hcd *xhci,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册