[PATCH] usb/xhci: unify parameter of xhci_msi_irq

[PATCH] usb/xhci: unify parameter of xhci_msi_irq

[Alex Shi]

Ops, I just find a old patch left on my laptop. and it still works on latest
Linus tree. I don't remember there is a reasonable excuse to reject this patch.

So, anyone like to pick it up?

------
>From 6ae1b9e71f9b14be5774ae9c1b4cf57cd4e747ac Mon Sep 17 00:00:00 2001
From: Alex Shi <alex.shi@intel.com>
Date: Mon, 11 Jun 2012 15:10:18 +0800
Subject: [PATCH] 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>
---
 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 23b4aef..cc8a52f 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -2479,7 +2479,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 afdc73e..f7d40c1 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -215,7 +215,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");
@@ -287,7 +287,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 de3d6e3..737ef54 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1710,7 +1710,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.7.5.4

-- 
Thanks
    Alex

Re: [PATCH] usb/xhci: unify parameter of xhci_msi_irq

[Alex Shi]

On 05/24/2013 10:54 AM, Alex Shi wrote:
> 
> Ops, I just find a old patch left on my laptop. and it still works on latest
> Linus tree. I don't remember there is a reasonable excuse to reject this patch.
> 
> So, anyone like to pick it up?

Ping ...
> 
> ------
> From 6ae1b9e71f9b14be5774ae9c1b4cf57cd4e747ac Mon Sep 17 00:00:00 2001
> From: Alex Shi <alex.shi@intel.com>
> Date: Mon, 11 Jun 2012 15:10:18 +0800
> Subject: [PATCH] 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>
> ---
>  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 23b4aef..cc8a52f 100644
> --- a/drivers/usb/host/xhci-ring.c
> +++ b/drivers/usb/host/xhci-ring.c
> @@ -2479,7 +2479,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 afdc73e..f7d40c1 100644
> --- a/drivers/usb/host/xhci.c
> +++ b/drivers/usb/host/xhci.c
> @@ -215,7 +215,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");
> @@ -287,7 +287,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 de3d6e3..737ef54 100644
> --- a/drivers/usb/host/xhci.h
> +++ b/drivers/usb/host/xhci.h
> @@ -1710,7 +1710,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,
> 


-- 
Thanks
    Alex

Re: [PATCH] usb/xhci: unify parameter of xhci_msi_irq

[Alex Shi]

On 05/28/2013 09:39 PM, Alex Shi wrote:
> On 05/24/2013 10:54 AM, Alex Shi wrote:
>>
>> Ops, I just find a old patch left on my laptop. and it still works on latest
>> Linus tree. I don't remember there is a reasonable excuse to reject this patch.
>>
>> So, anyone like to pick it up?
> 
> Ping ...

Is there someone like to give a bit comments on this patch?
>>
>> ------
>> From 6ae1b9e71f9b14be5774ae9c1b4cf57cd4e747ac Mon Sep 17 00:00:00 2001
>> From: Alex Shi <alex.shi@intel.com>
>> Date: Mon, 11 Jun 2012 15:10:18 +0800
>> Subject: [PATCH] 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>
>> ---
>>  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 23b4aef..cc8a52f 100644
>> --- a/drivers/usb/host/xhci-ring.c
>> +++ b/drivers/usb/host/xhci-ring.c
>> @@ -2479,7 +2479,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 afdc73e..f7d40c1 100644
>> --- a/drivers/usb/host/xhci.c
>> +++ b/drivers/usb/host/xhci.c
>> @@ -215,7 +215,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");
>> @@ -287,7 +287,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 de3d6e3..737ef54 100644
>> --- a/drivers/usb/host/xhci.h
>> +++ b/drivers/usb/host/xhci.h
>> @@ -1710,7 +1710,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,
>>
> 
> 


-- 
Thanks
    Alex

Re: [PATCH] usb/xhci: unify parameter of xhci_msi_irq

[Sarah Sharp]

Hi Alex,

Thanks for updating this patch against current kernels.  However, I'm
really behind on patch review because of OPW, so I'm sorry, but I may
not be able to review this until next week.

Sarah Sharp

On Wed, May 29, 2013 at 09:31:58PM +0800, Alex Shi wrote:
> On 05/28/2013 09:39 PM, Alex Shi wrote:
> > On 05/24/2013 10:54 AM, Alex Shi wrote:
> >>
> >> Ops, I just find a old patch left on my laptop. and it still works on latest
> >> Linus tree. I don't remember there is a reasonable excuse to reject this patch.
> >>
> >> So, anyone like to pick it up?
> > 
> > Ping ...
> 
> Is there someone like to give a bit comments on this patch?
> >>
> >> ------
> >> From 6ae1b9e71f9b14be5774ae9c1b4cf57cd4e747ac Mon Sep 17 00:00:00 2001
> >> From: Alex Shi <alex.shi@intel.com>
> >> Date: Mon, 11 Jun 2012 15:10:18 +0800
> >> Subject: [PATCH] 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>
> >> ---
> >>  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 23b4aef..cc8a52f 100644
> >> --- a/drivers/usb/host/xhci-ring.c
> >> +++ b/drivers/usb/host/xhci-ring.c
> >> @@ -2479,7 +2479,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 afdc73e..f7d40c1 100644
> >> --- a/drivers/usb/host/xhci.c
> >> +++ b/drivers/usb/host/xhci.c
> >> @@ -215,7 +215,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");
> >> @@ -287,7 +287,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 de3d6e3..737ef54 100644
> >> --- a/drivers/usb/host/xhci.h
> >> +++ b/drivers/usb/host/xhci.h
> >> @@ -1710,7 +1710,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,
> >>
> > 
> > 
> 
> 
> -- 
> Thanks
>     Alex

Re: [PATCH] usb/xhci: unify parameter of xhci_msi_irq

[Sarah Sharp]

Ok, after a brief glance, this looks fine.  I've queued it to my
usb-next branch, and it should go to Greg by next week.

Sarah Sharp

On Fri, May 24, 2013 at 10:54:19AM +0800, Alex Shi wrote:
> 
> Ops, I just find a old patch left on my laptop. and it still works on latest
> Linus tree. I don't remember there is a reasonable excuse to reject this patch.
> 
> So, anyone like to pick it up?
> 
> ------
> From 6ae1b9e71f9b14be5774ae9c1b4cf57cd4e747ac Mon Sep 17 00:00:00 2001
> From: Alex Shi <alex.shi@intel.com>
> Date: Mon, 11 Jun 2012 15:10:18 +0800
> Subject: [PATCH] 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>
> ---
>  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 23b4aef..cc8a52f 100644
> --- a/drivers/usb/host/xhci-ring.c
> +++ b/drivers/usb/host/xhci-ring.c
> @@ -2479,7 +2479,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 afdc73e..f7d40c1 100644
> --- a/drivers/usb/host/xhci.c
> +++ b/drivers/usb/host/xhci.c
> @@ -215,7 +215,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");
> @@ -287,7 +287,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 de3d6e3..737ef54 100644
> --- a/drivers/usb/host/xhci.h
> +++ b/drivers/usb/host/xhci.h
> @@ -1710,7 +1710,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.7.5.4
> 
> -- 
> Thanks
>     Alex

Re: [PATCH] usb/xhci: unify parameter of xhci_msi_irq

[Alex Shi]

On 08/26/2012 10:01 AM, Sarah Sharp wrote:

> On Mon, Aug 13, 2012 at 01:59:00PM +0800, Alex Shi wrote:
>> On 06/12/2012 05:14 AM, gregkh wrote:
>>
>>> On Mon, Jun 11, 2012 at 01:47:09PM -0700, Sarah Sharp wrote:
>>>> Hi Alex,
>>>>
>>>> This got lost in the 3.5 push, but I think it's a good candidate for
>>>> 3.6.  I think Greg is accepting 3.6 patches now, and I'll send this off
>>>> to him.
>>>
>>> Yes, I am taking 3.6 stuff now.  In the future, once -rc1 is out, I can
>>> take patches for the next release at that point in time.
>>>
>>> greg k-h
>>>
>>
>>
>> Didn't find the patch in upstream 3.6-rc, but it is still workable for
>> upstream kernel.
>> So, was you just going to apply it on 3.7 kernel?  or just forget it?
> 
> Hi Alex,
> 
> I am human, and trying my human best to keep up as a maintainer.  Bug
> fixes and big features take priority over the small improvements, and
> I'm sorry that your patch (and other patches) have fallen by the
> wayside.  It is not personal, I simply cannot be perfect.
> 
> I will be returning to full maintainership duties after the various
> Linux conferences next week, and I will do my best to get your patch
> merged.


Thanks for your response, and pick up this small patch.

I am sorry, if you thought I want press you on a such small issue.
Actually, I just went to have a kindly reminder.

Thanks again for your consideration and maintain job!


> 
> Sarah Sharp



-- 
Thanks
    Alex

Re: [PATCH] usb/xhci: unify parameter of xhci_msi_irq

[Sarah Sharp]

On Mon, Aug 13, 2012 at 01:59:00PM +0800, Alex Shi wrote:
> On 06/12/2012 05:14 AM, gregkh wrote:
> 
> > On Mon, Jun 11, 2012 at 01:47:09PM -0700, Sarah Sharp wrote:
> >> Hi Alex,
> >>
> >> This got lost in the 3.5 push, but I think it's a good candidate for
> >> 3.6.  I think Greg is accepting 3.6 patches now, and I'll send this off
> >> to him.
> > 
> > Yes, I am taking 3.6 stuff now.  In the future, once -rc1 is out, I can
> > take patches for the next release at that point in time.
> > 
> > greg k-h
> > 
> 
> 
> Didn't find the patch in upstream 3.6-rc, but it is still workable for
> upstream kernel.
> So, was you just going to apply it on 3.7 kernel?  or just forget it?

Hi Alex,

I am human, and trying my human best to keep up as a maintainer.  Bug
fixes and big features take priority over the small improvements, and
I'm sorry that your patch (and other patches) have fallen by the
wayside.  It is not personal, I simply cannot be perfect.

I will be returning to full maintainership duties after the various
Linux conferences next week, and I will do my best to get your patch
merged.

Sarah Sharp

Re: [PATCH] usb/xhci: unify parameter of xhci_msi_irq

[Alex Shi]

On 06/12/2012 05:14 AM, gregkh wrote:

> On Mon, Jun 11, 2012 at 01:47:09PM -0700, Sarah Sharp wrote:
>> Hi Alex,
>>
>> This got lost in the 3.5 push, but I think it's a good candidate for
>> 3.6.  I think Greg is accepting 3.6 patches now, and I'll send this off
>> to him.
> 
> Yes, I am taking 3.6 stuff now.  In the future, once -rc1 is out, I can
> take patches for the next release at that point in time.
> 
> greg k-h
> 


Didn't find the patch in upstream 3.6-rc, but it is still workable for
upstream kernel.
So, was you just going to apply it on 3.7 kernel?  or just forget it?

Thanks
Alex

Re: [PATCH] usb/xhci: unify parameter of xhci_msi_irq

[Alex Shi]

On 06/12/2012 05:14 AM, gregkh wrote:

> On Mon, Jun 11, 2012 at 01:47:09PM -0700, Sarah Sharp wrote:
>> Hi Alex,
>>
>> This got lost in the 3.5 push, but I think it's a good candidate for
>> 3.6.  I think Greg is accepting 3.6 patches now, and I'll send this off
>> to him.
> 
> Yes, I am taking 3.6 stuff now.  In the future, once -rc1 is out, I can
> take patches for the next release at that point in time.


I see. Thanks all.

> 
> greg k-h

Re: [PATCH] usb/xhci: unify parameter of xhci_msi_irq

[gregkh]

On Mon, Jun 11, 2012 at 01:47:09PM -0700, Sarah Sharp wrote:
> Hi Alex,
> 
> This got lost in the 3.5 push, but I think it's a good candidate for
> 3.6.  I think Greg is accepting 3.6 patches now, and I'll send this off
> to him.

Yes, I am taking 3.6 stuff now.  In the future, once -rc1 is out, I can
take patches for the next release at that point in time.

greg k-h

Re: [PATCH] usb/xhci: unify parameter of xhci_msi_irq

[Sarah Sharp]

Hi Alex,

This got lost in the 3.5 push, but I think it's a good candidate for
3.6.  I think Greg is accepting 3.6 patches now, and I'll send this off
to him.

Sarah Sharp

On Mon, Jun 11, 2012 at 03:14:32PM +0800, Alex Shi wrote:
> On 05/30/2012 03:46 PM, Alex Shi wrote:
> 
> > 
> >>>> Is this needed in my -next tree now?  Or is it something for later?
> >>>
> >>>
> >>> Appreciate if it can be in -next tree. :)
> >>>
> >>>>
> >>>> Any reason you did not put Sarah on the To: line here?  She's the one
> >>>> that needs to ack it before I can accept it.
> >>>
> >>>
> >>> Sarah, would you like to give some comments here?
> >>
> >> Looks fine.  I'll send a pull request to Greg with this patch after I
> >> verify it doesn't generate new warnings.
> >>
> > 
> > 
> > Sarah, any further comments for this patch? :)
> 
> 
> 
> 
> 
> Just try on 3.5-rc2 kernel, find it still works.
> Sarah, do you mind to give some comments for this?
> 
> -------------
> 
> 
> From 6ae1b9e71f9b14be5774ae9c1b4cf57cd4e747ac Mon Sep 17 00:00:00 2001
> From: Alex Shi <alex.shi@intel.com>
> Date: Mon, 11 Jun 2012 15:10:18 +0800
> Subject: [PATCH] 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 fix it.
> 
> Signed-off-by: Alex Shi <alex.shi@intel.com>
> 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 23b4aef..cc8a52f 100644
> --- a/drivers/usb/host/xhci-ring.c
> +++ b/drivers/usb/host/xhci-ring.c
> @@ -2479,7 +2479,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 afdc73e..f7d40c1 100644
> --- a/drivers/usb/host/xhci.c
> +++ b/drivers/usb/host/xhci.c
> @@ -215,7 +215,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");
> @@ -287,7 +287,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 de3d6e3..737ef54 100644
> --- a/drivers/usb/host/xhci.h
> +++ b/drivers/usb/host/xhci.h
> @@ -1710,7 +1710,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.7.5.4
> 

Re: [PATCH] usb/xhci: unify parameter of xhci_msi_irq

[Alex Shi]

On 05/30/2012 03:46 PM, Alex Shi wrote:

> 
>>>> Is this needed in my -next tree now?  Or is it something for later?
>>>
>>>
>>> Appreciate if it can be in -next tree. :)
>>>
>>>>
>>>> Any reason you did not put Sarah on the To: line here?  She's the one
>>>> that needs to ack it before I can accept it.
>>>
>>>
>>> Sarah, would you like to give some comments here?
>>
>> Looks fine.  I'll send a pull request to Greg with this patch after I
>> verify it doesn't generate new warnings.
>>
> 
> 
> Sarah, any further comments for this patch? :)





Just try on 3.5-rc2 kernel, find it still works.
Sarah, do you mind to give some comments for this?

-------------


>From 6ae1b9e71f9b14be5774ae9c1b4cf57cd4e747ac Mon Sep 17 00:00:00 2001
From: Alex Shi <alex.shi@intel.com>
Date: Mon, 11 Jun 2012 15:10:18 +0800
Subject: [PATCH] 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 fix it.

Signed-off-by: Alex Shi <alex.shi@intel.com>
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 23b4aef..cc8a52f 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -2479,7 +2479,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 afdc73e..f7d40c1 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -215,7 +215,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");
@@ -287,7 +287,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 de3d6e3..737ef54 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1710,7 +1710,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.7.5.4

Re: [PATCH] usb/xhci: unify parameter of xhci_msi_irq

[Alex Shi]

>>> Is this needed in my -next tree now?  Or is it something for later?
>>
>>
>> Appreciate if it can be in -next tree. :)
>>
>>>
>>> Any reason you did not put Sarah on the To: line here?  She's the one
>>> that needs to ack it before I can accept it.
>>
>>
>> Sarah, would you like to give some comments here?
> 
> Looks fine.  I'll send a pull request to Greg with this patch after I
> verify it doesn't generate new warnings.
> 


Sarah, any further comments for this patch? :)

Re: [PATCH] usb/xhci: unify parameter of xhci_msi_irq

[Alex Shi]

>> Sarah, would you like to give some comments here?
> 
> Looks fine.  I'll send a pull request to Greg with this patch after I
> verify it doesn't generate new warnings.
> 
> Sarah Sharp


Thanks!

Re: [PATCH] usb/xhci: unify parameter of xhci_msi_irq

[Sarah Sharp]

On Thu, Mar 15, 2012 at 11:03:19PM +0800, Alex Shi wrote:
> On 03/15/2012 10:57 PM, gregkh wrote:
> 
> > 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>
> >> ---
> >>  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(-)
> > 
> > Is this needed in my -next tree now?  Or is it something for later?
> 
> 
> Appreciate if it can be in -next tree. :)
> 
> > 
> > Any reason you did not put Sarah on the To: line here?  She's the one
> > that needs to ack it before I can accept it.
> 
> 
> Sarah, would you like to give some comments here?

Looks fine.  I'll send a pull request to Greg with this patch after I
verify it doesn't generate new warnings.

Sarah Sharp

Re: [PATCH] usb/xhci: unify parameter of xhci_msi_irq

[Alex Shi]

On 03/15/2012 10:57 PM, gregkh wrote:

> 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>
>> ---
>>  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(-)
> 
> Is this needed in my -next tree now?  Or is it something for later?


Appreciate if it can be in -next tree. :)

> 
> Any reason you did not put Sarah on the To: line here?  She's the one
> that needs to ack it before I can accept it.


Sarah, would you like to give some comments here?

Thanks!

> 
> thanks,
> 
> greg k-h

Re: [PATCH] usb/xhci: unify parameter of xhci_msi_irq

[gregkh]

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>
> ---
>  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(-)

Is this needed in my -next tree now?  Or is it something for later?

Any reason you did not put Sarah on the To: line here?  She's the one
that needs to ack it before I can accept it.

thanks,

greg k-h

Re: [PATCH] usb/xhci: unify parameter of xhci_msi_irq

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 2426 bytes --]

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

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[PATCH] usb/xhci: unify parameter of xhci_msi_irq

[Alex Shi]

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