* [PATCH] USB/host: Cleanup unneccessary irq disable code
@ 2012-09-01 9:39 Liu, Chuansheng
2012-09-04 15:08 ` Alan Stern
2012-09-05 23:59 ` gregkh
0 siblings, 2 replies; 6+ messages in thread
From: Liu, Chuansheng @ 2012-09-01 9:39 UTC (permalink / raw)
To: linux-kernel, linux-usb; +Cc: gregkh, stern, tglx
From: liu chuansheng <chuansheng.liu@intel.com>
Subject: [PATCH] USB/host: Cleanup unneccessary irq disable code
Because the IRQF_DISABLED as the flag is now a NOOP and has been
deprecated and in hardirq context the interrupt is disabled.
so in usb/host code:
Removing the usage of flag IRQF_DISABLED;
Removing the calling local_irq save/restore actions in irq
handler usb_hcd_irq();
Signed-off-by: liu chuansheng <chuansheng.liu@intel.com>
---
drivers/usb/core/hcd.c | 15 ---------------
drivers/usb/host/ehci-ls1x.c | 2 +-
drivers/usb/host/ohci-xls.c | 2 +-
3 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index bc84106..f84ddea 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -2153,15 +2153,8 @@ EXPORT_SYMBOL_GPL(usb_bus_start_enum);
irqreturn_t usb_hcd_irq (int irq, void *__hcd)
{
struct usb_hcd *hcd = __hcd;
- unsigned long flags;
irqreturn_t rc;
- /* IRQF_DISABLED doesn't work correctly with shared IRQs
- * when the first handler doesn't use it. So let's just
- * assume it's never used.
- */
- local_irq_save(flags);
-
if (unlikely(HCD_DEAD(hcd) || !HCD_HW_ACCESSIBLE(hcd)))
rc = IRQ_NONE;
else if (hcd->driver->irq(hcd) == IRQ_NONE)
@@ -2169,7 +2162,6 @@ irqreturn_t usb_hcd_irq (int irq, void *__hcd)
else
rc = IRQ_HANDLED;
- local_irq_restore(flags);
return rc;
}
EXPORT_SYMBOL_GPL(usb_hcd_irq);
@@ -2358,13 +2350,6 @@ static int usb_hcd_request_irqs(struct usb_hcd *hcd,
if (hcd->driver->irq) {
- /* IRQF_DISABLED doesn't work as advertised when used together
- * with IRQF_SHARED. As usb_hcd_irq() will always disable
- * interrupts we can remove it here.
- */
- if (irqflags & IRQF_SHARED)
- irqflags &= ~IRQF_DISABLED;
-
snprintf(hcd->irq_descr, sizeof(hcd->irq_descr), "%s:usb%d",
hcd->driver->description, hcd->self.busnum);
retval = request_irq(irqnum, &usb_hcd_irq, irqflags,
diff --git a/drivers/usb/host/ehci-ls1x.c b/drivers/usb/host/ehci-ls1x.c
index a283e59..425cb4a 100644
--- a/drivers/usb/host/ehci-ls1x.c
+++ b/drivers/usb/host/ehci-ls1x.c
@@ -119,7 +119,7 @@ static int ehci_hcd_ls1x_probe(struct platform_device *pdev)
goto err_release_region;
}
- ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
+ ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (ret)
goto err_iounmap;
diff --git a/drivers/usb/host/ohci-xls.c b/drivers/usb/host/ohci-xls.c
index 41e378f..84201cd 100644
--- a/drivers/usb/host/ohci-xls.c
+++ b/drivers/usb/host/ohci-xls.c
@@ -56,7 +56,7 @@ static int ohci_xls_probe_internal(const struct hc_driver *driver,
goto err3;
}
- retval = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
+ retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (retval != 0)
goto err4;
return retval;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] USB/host: Cleanup unneccessary irq disable code
2012-09-01 9:39 [PATCH] USB/host: Cleanup unneccessary irq disable code Liu, Chuansheng
@ 2012-09-04 15:08 ` Alan Stern
2012-09-05 23:59 ` gregkh
1 sibling, 0 replies; 6+ messages in thread
From: Alan Stern @ 2012-09-04 15:08 UTC (permalink / raw)
To: Liu, Chuansheng; +Cc: linux-kernel, linux-usb, gregkh, tglx
On Sat, 1 Sep 2012, Liu, Chuansheng wrote:
> From: liu chuansheng <chuansheng.liu@intel.com>
> Subject: [PATCH] USB/host: Cleanup unneccessary irq disable code
>
> Because the IRQF_DISABLED as the flag is now a NOOP and has been
> deprecated and in hardirq context the interrupt is disabled.
>
> so in usb/host code:
> Removing the usage of flag IRQF_DISABLED;
> Removing the calling local_irq save/restore actions in irq
> handler usb_hcd_irq();
>
> Signed-off-by: liu chuansheng <chuansheng.liu@intel.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] USB/host: Cleanup unneccessary irq disable code
2012-09-01 9:39 [PATCH] USB/host: Cleanup unneccessary irq disable code Liu, Chuansheng
2012-09-04 15:08 ` Alan Stern
@ 2012-09-05 23:59 ` gregkh
2012-09-06 0:39 ` Liu, Chuansheng
1 sibling, 1 reply; 6+ messages in thread
From: gregkh @ 2012-09-05 23:59 UTC (permalink / raw)
To: Liu, Chuansheng; +Cc: linux-kernel, linux-usb, stern, tglx
On Sat, Sep 01, 2012 at 09:39:56AM +0000, Liu, Chuansheng wrote:
> From: liu chuansheng <chuansheng.liu@intel.com>
> Subject: [PATCH] USB/host: Cleanup unneccessary irq disable code
Don't include the Subject: in the patch body again, that is pointless
and requires me to hand-edit the file.
> Because the IRQF_DISABLED as the flag is now a NOOP and has been
> deprecated and in hardirq context the interrupt is disabled.
>
> so in usb/host code:
> Removing the usage of flag IRQF_DISABLED;
> Removing the calling local_irq save/restore actions in irq
> handler usb_hcd_irq();
>
> Signed-off-by: liu chuansheng <chuansheng.liu@intel.com>
This patch is corrupted and can not be applied at all. Please fix your
email client and try again.
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH] USB/host: Cleanup unneccessary irq disable code
2012-09-05 23:59 ` gregkh
@ 2012-09-06 0:39 ` Liu, Chuansheng
2012-09-06 1:10 ` gregkh
0 siblings, 1 reply; 6+ messages in thread
From: Liu, Chuansheng @ 2012-09-06 0:39 UTC (permalink / raw)
To: gregkh; +Cc: linux-kernel, linux-usb, stern, tglx
> This patch is corrupted and can not be applied at all. Please fix your email
> client and try again.
>
> greg k-h
I am very sorry to waste your time, resend it again.
From: liu chuansheng <chuansheng.liu@intel.com>
Subject: [PATCH] USB/host: Cleanup unneccessary irq disable code
Because the IRQF_DISABLED as the flag is now a NOOP and has been
deprecated and in hardirq context the interrupt is disabled.
so in usb/host code:
Removing the usage of flag IRQF_DISABLED;
Removing the calling local_irq save/restore actions in irq
handler usb_hcd_irq();
Signed-off-by: liu chuansheng <chuansheng.liu@intel.com>
---
drivers/usb/core/hcd.c | 15 ---------------
drivers/usb/host/ehci-ls1x.c | 2 +-
drivers/usb/host/ohci-xls.c | 2 +-
3 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index bc84106..f84ddea 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -2153,15 +2153,8 @@ EXPORT_SYMBOL_GPL(usb_bus_start_enum);
irqreturn_t usb_hcd_irq (int irq, void *__hcd)
{
struct usb_hcd *hcd = __hcd;
- unsigned long flags;
irqreturn_t rc;
- /* IRQF_DISABLED doesn't work correctly with shared IRQs
- * when the first handler doesn't use it. So let's just
- * assume it's never used.
- */
- local_irq_save(flags);
-
if (unlikely(HCD_DEAD(hcd) || !HCD_HW_ACCESSIBLE(hcd)))
rc = IRQ_NONE;
else if (hcd->driver->irq(hcd) == IRQ_NONE)
@@ -2169,7 +2162,6 @@ irqreturn_t usb_hcd_irq (int irq, void *__hcd)
else
rc = IRQ_HANDLED;
- local_irq_restore(flags);
return rc;
}
EXPORT_SYMBOL_GPL(usb_hcd_irq);
@@ -2358,13 +2350,6 @@ static int usb_hcd_request_irqs(struct usb_hcd *hcd,
if (hcd->driver->irq) {
- /* IRQF_DISABLED doesn't work as advertised when used together
- * with IRQF_SHARED. As usb_hcd_irq() will always disable
- * interrupts we can remove it here.
- */
- if (irqflags & IRQF_SHARED)
- irqflags &= ~IRQF_DISABLED;
-
snprintf(hcd->irq_descr, sizeof(hcd->irq_descr), "%s:usb%d",
hcd->driver->description, hcd->self.busnum);
retval = request_irq(irqnum, &usb_hcd_irq, irqflags,
diff --git a/drivers/usb/host/ehci-ls1x.c b/drivers/usb/host/ehci-ls1x.c
index a283e59..425cb4a 100644
--- a/drivers/usb/host/ehci-ls1x.c
+++ b/drivers/usb/host/ehci-ls1x.c
@@ -119,7 +119,7 @@ static int ehci_hcd_ls1x_probe(struct platform_device *pdev)
goto err_release_region;
}
- ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
+ ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (ret)
goto err_iounmap;
diff --git a/drivers/usb/host/ohci-xls.c b/drivers/usb/host/ohci-xls.c
index 41e378f..84201cd 100644
--- a/drivers/usb/host/ohci-xls.c
+++ b/drivers/usb/host/ohci-xls.c
@@ -56,7 +56,7 @@ static int ohci_xls_probe_internal(const struct hc_driver *driver,
goto err3;
}
- retval = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
+ retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (retval != 0)
goto err4;
return retval;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] USB/host: Cleanup unneccessary irq disable code
2012-09-06 0:39 ` Liu, Chuansheng
@ 2012-09-06 1:10 ` gregkh
2012-09-06 1:22 ` Liu, Chuansheng
0 siblings, 1 reply; 6+ messages in thread
From: gregkh @ 2012-09-06 1:10 UTC (permalink / raw)
To: Liu, Chuansheng; +Cc: linux-kernel, linux-usb, stern, tglx
On Thu, Sep 06, 2012 at 12:39:09AM +0000, Liu, Chuansheng wrote:
> > This patch is corrupted and can not be applied at all. Please fix your email
> > client and try again.
> >
> > greg k-h
>
> I am very sorry to waste your time, resend it again.
>
> From: liu chuansheng <chuansheng.liu@intel.com>
> Subject: [PATCH] USB/host: Cleanup unneccessary irq disable code
Why is this in the patch?
Please resend it in a format that I do not have to manually edit the
patch.
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH] USB/host: Cleanup unneccessary irq disable code
2012-09-06 1:10 ` gregkh
@ 2012-09-06 1:22 ` Liu, Chuansheng
0 siblings, 0 replies; 6+ messages in thread
From: Liu, Chuansheng @ 2012-09-06 1:22 UTC (permalink / raw)
To: gregkh; +Cc: linux-kernel, linux-usb, stern, tglx
> > From: liu chuansheng <chuansheng.liu@intel.com>
> > Subject: [PATCH] USB/host: Cleanup unneccessary irq disable code
>
> Why is this in the patch?
>
> Please resend it in a format that I do not have to manually edit the patch.
>
> greg k-h
Thanks your teaching, resend again.
Because the IRQF_DISABLED as the flag is now a NOOP and has been
deprecated and in hardirq context the interrupt is disabled.
so in usb/host code:
Removing the usage of flag IRQF_DISABLED;
Removing the calling local_irq save/restore actions in irq
handler usb_hcd_irq();
Signed-off-by: liu chuansheng <chuansheng.liu@intel.com>
---
drivers/usb/core/hcd.c | 15 ---------------
drivers/usb/host/ehci-ls1x.c | 2 +-
drivers/usb/host/ohci-xls.c | 2 +-
3 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index bc84106..f84ddea 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -2153,15 +2153,8 @@ EXPORT_SYMBOL_GPL(usb_bus_start_enum);
irqreturn_t usb_hcd_irq (int irq, void *__hcd)
{
struct usb_hcd *hcd = __hcd;
- unsigned long flags;
irqreturn_t rc;
- /* IRQF_DISABLED doesn't work correctly with shared IRQs
- * when the first handler doesn't use it. So let's just
- * assume it's never used.
- */
- local_irq_save(flags);
-
if (unlikely(HCD_DEAD(hcd) || !HCD_HW_ACCESSIBLE(hcd)))
rc = IRQ_NONE;
else if (hcd->driver->irq(hcd) == IRQ_NONE)
@@ -2169,7 +2162,6 @@ irqreturn_t usb_hcd_irq (int irq, void *__hcd)
else
rc = IRQ_HANDLED;
- local_irq_restore(flags);
return rc;
}
EXPORT_SYMBOL_GPL(usb_hcd_irq);
@@ -2358,13 +2350,6 @@ static int usb_hcd_request_irqs(struct usb_hcd *hcd,
if (hcd->driver->irq) {
- /* IRQF_DISABLED doesn't work as advertised when used together
- * with IRQF_SHARED. As usb_hcd_irq() will always disable
- * interrupts we can remove it here.
- */
- if (irqflags & IRQF_SHARED)
- irqflags &= ~IRQF_DISABLED;
-
snprintf(hcd->irq_descr, sizeof(hcd->irq_descr), "%s:usb%d",
hcd->driver->description, hcd->self.busnum);
retval = request_irq(irqnum, &usb_hcd_irq, irqflags,
diff --git a/drivers/usb/host/ehci-ls1x.c b/drivers/usb/host/ehci-ls1x.c
index a283e59..425cb4a 100644
--- a/drivers/usb/host/ehci-ls1x.c
+++ b/drivers/usb/host/ehci-ls1x.c
@@ -119,7 +119,7 @@ static int ehci_hcd_ls1x_probe(struct platform_device *pdev)
goto err_release_region;
}
- ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
+ ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (ret)
goto err_iounmap;
diff --git a/drivers/usb/host/ohci-xls.c b/drivers/usb/host/ohci-xls.c
index 41e378f..84201cd 100644
--- a/drivers/usb/host/ohci-xls.c
+++ b/drivers/usb/host/ohci-xls.c
@@ -56,7 +56,7 @@ static int ohci_xls_probe_internal(const struct hc_driver *driver,
goto err3;
}
- retval = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
+ retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (retval != 0)
goto err4;
return retval;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-09-06 1:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-01 9:39 [PATCH] USB/host: Cleanup unneccessary irq disable code Liu, Chuansheng
2012-09-04 15:08 ` Alan Stern
2012-09-05 23:59 ` gregkh
2012-09-06 0:39 ` Liu, Chuansheng
2012-09-06 1:10 ` gregkh
2012-09-06 1:22 ` Liu, Chuansheng
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).