From: Alex Shi <alex.shi@intel.com>
To: Alan stern <stern@rowland.harvard.edu>,
gregkh <gregkh@linuxfoundation.org>, Felipe Balbi <balbi@ti.com>
Cc: "Sharp, Sarah A" <sarah.a.sharp@intel.com>,
linux-usb <linux-usb@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH] usb/xhci: unify parameter of xhci_msi_irq
Date: Thu, 15 Mar 2012 12:53:06 +0800 [thread overview]
Message-ID: <1331787186.2979.71.camel@debian> (raw)
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>
---
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
next reply other threads:[~2012-03-15 4:53 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-15 4:53 Alex Shi [this message]
2012-03-15 9:08 ` [PATCH] usb/xhci: unify parameter of xhci_msi_irq Felipe Balbi
2012-03-15 14:57 ` gregkh
2012-03-15 15:03 ` Alex Shi
2012-03-15 17:56 ` Sarah Sharp
2012-03-17 0:02 ` Alex Shi
2012-05-30 7:46 ` Alex Shi
2012-06-11 7:14 ` Alex Shi
2012-06-11 20:47 ` Sarah Sharp
2012-06-11 21:14 ` gregkh
2012-06-12 0:05 ` Alex Shi
2012-08-13 5:59 ` Alex Shi
2012-08-26 2:01 ` Sarah Sharp
2012-08-26 13:58 ` Alex Shi
-- strict thread matches above, loose matches on Subject: below --
2013-05-24 2:54 Alex Shi
2013-05-28 13:39 ` Alex Shi
2013-05-29 13:31 ` Alex Shi
2013-06-05 23:29 ` Sarah Sharp
2013-06-05 23:52 ` Sarah Sharp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1331787186.2979.71.camel@debian \
--to=alex.shi@intel.com \
--cc=balbi@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=sarah.a.sharp@intel.com \
--cc=stern@rowland.harvard.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).