aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/otg
diff options
context:
space:
mode:
authorFelipe Balbi <felipe.balbi@nokia.com>2009-12-28 06:02:48 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-02 17:53:40 -0500
commit8f20960cd772fe42a9cdd36312b2247bc2800ffb (patch)
treee235f8e9dac59699ff5bb1664ea3371d7ef620f6 /drivers/usb/otg
parentc9188ad25dde86e929bd567166b5a1366a3a9059 (diff)
usb: otg: twl4030: move to request_threaded_irq
move to request_threaded_irq() on twl4030 children. Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/otg')
-rw-r--r--drivers/usb/otg/twl4030-usb.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/usb/otg/twl4030-usb.c b/drivers/usb/otg/twl4030-usb.c
index 34452d95b386..3e4e9f434d78 100644
--- a/drivers/usb/otg/twl4030-usb.c
+++ b/drivers/usb/otg/twl4030-usb.c
@@ -567,14 +567,6 @@ static irqreturn_t twl4030_usb_irq(int irq, void *_twl)
567 struct twl4030_usb *twl = _twl; 567 struct twl4030_usb *twl = _twl;
568 int status; 568 int status;
569 569
570#ifdef CONFIG_LOCKDEP
571 /* WORKAROUND for lockdep forcing IRQF_DISABLED on us, which
572 * we don't want and can't tolerate. Although it might be
573 * friendlier not to borrow this thread context...
574 */
575 local_irq_enable();
576#endif
577
578 status = twl4030_usb_linkstat(twl); 570 status = twl4030_usb_linkstat(twl);
579 if (status >= 0) { 571 if (status >= 0) {
580 /* FIXME add a set_power() method so that B-devices can 572 /* FIXME add a set_power() method so that B-devices can
@@ -695,7 +687,7 @@ static int __devinit twl4030_usb_probe(struct platform_device *pdev)
695 * need both handles, otherwise just one suffices. 687 * need both handles, otherwise just one suffices.
696 */ 688 */
697 twl->irq_enabled = true; 689 twl->irq_enabled = true;
698 status = request_irq(twl->irq, twl4030_usb_irq, 690 status = request_threaded_irq(twl->irq, NULL, twl4030_usb_irq,
699 IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, 691 IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
700 "twl4030_usb", twl); 692 "twl4030_usb", twl);
701 if (status < 0) { 693 if (status < 0) {