Commit 851ec164 authored by Alex Shi's avatar Alex Shi Committed by Sarah Sharp
Browse files

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: default avatarAlex Shi <alex.shi@intel.com>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
parent 01c5f447

drivers/usb/host/xhci-ring.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2799,7 +2799,7 @@ hw_died: 
	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);

}

}

drivers/usb/host/xhci.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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) 




	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;

drivers/usb/host/xhci.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE