diff options
| author | Yong Zhang <yong.zhang0@gmail.com> | 2011-09-22 16:59:11 +0800 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2011-11-26 00:34:12 +0400 |
| commit | 3b176b25a8146673ade4772d1edfe318caa6818a (patch) | |
| tree | 05817f20a5d28812f793c5e3b5ef8aaa7147c2fa | |
| parent | 8cfaaa811894a3ae2d7360a15a6cfccff3ebc7db (diff) | |
| download | linux-3.10-3b176b25a8146673ade4772d1edfe318caa6818a.tar.gz linux-3.10-3b176b25a8146673ade4772d1edfe318caa6818a.tar.bz2 linux-3.10-3b176b25a8146673ade4772d1edfe318caa6818a.zip | |
power_supply: 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>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
| -rw-r--r-- | drivers/power/wm97xx_battery.c | 2 | ||||
| -rw-r--r-- | drivers/power/z2_battery.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c index 156559e56fa..cf8681c1f8e 100644 --- a/drivers/power/wm97xx_battery.c +++ b/drivers/power/wm97xx_battery.c @@ -196,7 +196,7 @@ static int __devinit wm97xx_bat_probe(struct platform_device *dev) if (ret) goto err2; ret = request_irq(gpio_to_irq(pdata->charge_gpio), - wm97xx_chrg_irq, IRQF_DISABLED, + wm97xx_chrg_irq, 0, "AC Detect", dev); if (ret) goto err2; diff --git a/drivers/power/z2_battery.c b/drivers/power/z2_battery.c index ae38c44ccd4..636ebb2a0e8 100644 --- a/drivers/power/z2_battery.c +++ b/drivers/power/z2_battery.c @@ -218,7 +218,7 @@ static int __devinit z2_batt_probe(struct i2c_client *client, irq_set_irq_type(gpio_to_irq(info->charge_gpio), IRQ_TYPE_EDGE_BOTH); ret = request_irq(gpio_to_irq(info->charge_gpio), - z2_charge_switch_irq, IRQF_DISABLED, + z2_charge_switch_irq, 0, "AC Detect", charger); if (ret) goto err3; |