diff options
author | Yong Zhang <yong.zhang0@gmail.com> | 2011-10-21 19:56:53 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-11-07 22:51:46 -0500 |
commit | 6ea741a13690da9dbbac76175db8e313b0c4b817 (patch) | |
tree | cd0ed2912ef82ba58e6fbf3bc657c584b0f3fdb9 /drivers | |
parent | a3a9f3b47d12b5f6dfc9c7ed9d7b193d77812195 (diff) |
powerpc/ps3: irq: Remove IRQF_DISABLED
Since commit [e58aa3d2: genirq: Run irq handlers with interrupts disabled],
We run all interrupt handlers with interrupts disabled
and we even check and yell when an interrupt handler
returns with interrupts enabled (see commit [b738a50a:
genirq: Warn when handler enables interrupts]).
So now this flag is a NOOP and can be removed.
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Acked-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ps3/ps3-vuart.c | 2 | ||||
-rw-r--r-- | drivers/ps3/ps3stor_lib.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ps3/ps3-vuart.c b/drivers/ps3/ps3-vuart.c index d9fb729535a1..fb7300837fee 100644 --- a/drivers/ps3/ps3-vuart.c +++ b/drivers/ps3/ps3-vuart.c | |||
@@ -952,7 +952,7 @@ static int ps3_vuart_bus_interrupt_get(void) | |||
952 | } | 952 | } |
953 | 953 | ||
954 | result = request_irq(vuart_bus_priv.virq, ps3_vuart_irq_handler, | 954 | result = request_irq(vuart_bus_priv.virq, ps3_vuart_irq_handler, |
955 | IRQF_DISABLED, "vuart", &vuart_bus_priv); | 955 | 0, "vuart", &vuart_bus_priv); |
956 | 956 | ||
957 | if (result) { | 957 | if (result) { |
958 | pr_debug("%s:%d: request_irq failed (%d)\n", | 958 | pr_debug("%s:%d: request_irq failed (%d)\n", |
diff --git a/drivers/ps3/ps3stor_lib.c b/drivers/ps3/ps3stor_lib.c index cc328dec946b..8c3f5adf1bc6 100644 --- a/drivers/ps3/ps3stor_lib.c +++ b/drivers/ps3/ps3stor_lib.c | |||
@@ -167,7 +167,7 @@ int ps3stor_setup(struct ps3_storage_device *dev, irq_handler_t handler) | |||
167 | goto fail_close_device; | 167 | goto fail_close_device; |
168 | } | 168 | } |
169 | 169 | ||
170 | error = request_irq(dev->irq, handler, IRQF_DISABLED, | 170 | error = request_irq(dev->irq, handler, 0, |
171 | dev->sbd.core.driver->name, dev); | 171 | dev->sbd.core.driver->name, dev); |
172 | if (error) { | 172 | if (error) { |
173 | dev_err(&dev->sbd.core, "%s:%u: request_irq failed %d\n", | 173 | dev_err(&dev->sbd.core, "%s:%u: request_irq failed %d\n", |