lkml.org 
[lkml]   [2011]   [Oct]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 01/49] usb/hcd: Remove tricky code dealing with IRQF_DISABLED && IRQF_SHARED
    Date
    Now, genirq keep irqs disabled when calling the action handler,
    we don't need to disable irq by ourselves anymore.

    Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
    ---
    drivers/usb/core/hcd.c | 15 ---------------
    1 files changed, 0 insertions(+), 15 deletions(-)

    diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
    index c9eb4e5..e98f605 100644
    --- a/drivers/usb/core/hcd.c
    +++ b/drivers/usb/core/hcd.c
    @@ -2125,15 +2125,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) {
    @@ -2145,7 +2138,6 @@ irqreturn_t usb_hcd_irq (int irq, void *__hcd)
    rc = IRQ_HANDLED;
    }

    - local_irq_restore(flags);
    return rc;
    }
    EXPORT_SYMBOL_GPL(usb_hcd_irq);
    @@ -2334,13 +2326,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,
    --
    1.7.1


    \
     
     \ /
      Last update: 2011-10-22 11:59    [W:0.021 / U:64.660 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site