lkml.org 
[lkml]   [2012]   [Mar]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] usb/xhci: unify parameter of xhci_msi_irq
On Thu, Mar 15, 2012 at 12:53:06PM +0800, Alex Shi wrote:
>
> 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>

after a quick look:

Acked-by: Felipe Balbi <balbi@ti.com>

> ---
> drivers/usb/host/xhci-ring.c | 2 +-
> drivers/usb/host/xhci.c | 4 ++--
> 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 b62037b..c5caad3 100644
> --- a/drivers/usb/host/xhci-ring.c
> +++ b/drivers/usb/host/xhci-ring.c
> @@ -2396,7 +2396,7 @@ hw_died:
> 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);
> }
> diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
> index c939f5f..84706cb 100644
> --- a/drivers/usb/host/xhci.c
> +++ b/drivers/usb/host/xhci.c
> @@ -204,7 +204,7 @@ static int xhci_setup_msi(struct xhci_hcd *xhci)
> 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));
> if (ret) {
> xhci_dbg(xhci, "disable MSI interrupt\n");
> @@ -276,7 +276,7 @@ static int xhci_setup_msix(struct xhci_hcd *xhci)
>
> for (i = 0; i < xhci->msix_count; i++) {
> ret = request_irq(xhci->msix_entries[i].vector,
> - (irq_handler_t)xhci_msi_irq,
> + xhci_msi_irq,
> 0, "xhci_hcd", xhci_to_hcd(xhci));
> if (ret)
> goto disable_msix;
> diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
> index fb99c83..d82cbb6 100644
> --- a/drivers/usb/host/xhci.h
> +++ b/drivers/usb/host/xhci.h
> @@ -1669,7 +1669,7 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated);
>
> int xhci_get_frame(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);
> void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev);
> int xhci_alloc_tt_info(struct xhci_hcd *xhci,
> --
> 1.6.3.3
>
>
>

--
balbi
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-03-15 10:11    [from the cache]
©2003-2011 Jasper Spaans