power: pass IRQF_ONESHOT to request_threaded_irq()
PATCH 1/1 power: pass IRQF_ONESHOT to request_threaded_irq()
Patch found using coccinelle.
--- drivers/power/ab8500_btemp.c | 2 +- drivers/power/ab8500_charger.c | 2 +- drivers/power/ab8500_fg.c | 2 +- drivers/power/lp8788-charger.c | 2 +- drivers/power/max17042_battery.c | 3 ++- drivers/power/max8903_charger.c | 12 +++++++++--- drivers/power/pm2301_charger.c | 2 +- drivers/power/smb347-charger.c | 3 ++- drivers/power/wm831x_power.c | 8 +++++--- 9 files changed, 23 insertions(+), 13 deletions(-)
drivers/power/ab8500_btemp.c +1 -1
@@ -1105,7 +1105,7 @@ static int ab8500_btemp_probe(struct platform_device *pdev)for (i =0 ; i <ARRAY_SIZE (ab8500_btemp_irq); i++) { irq =platform_get_irq_byname (pdev, ab8500_btemp_irq[i].name); ret =request_threaded_irq (irq,NULL , ab8500_btemp_irq[i].isr, -IRQF_SHARED |IRQF_NO_SUSPEND , +IRQF_SHARED |IRQF_NO_SUSPEND |IRQF_ONESHOT , ab8500_btemp_irq[i].name, di);if (ret) {
drivers/power/ab8500_charger.c +1 -1
@@ -3366,7 +3366,7 @@ static int ab8500_charger_probe(struct platform_device *pdev)for (i =0 ; i <ARRAY_SIZE (ab8500_charger_irq); i++) { irq =platform_get_irq_byname (pdev, ab8500_charger_irq[i].name); ret =request_threaded_irq (irq,NULL , ab8500_charger_irq[i].isr, -IRQF_SHARED |IRQF_NO_SUSPEND , +IRQF_SHARED |IRQF_NO_SUSPEND |IRQF_ONESHOT , ab8500_charger_irq[i].name, di);if (ret !=0 ) {
drivers/power/ab8500_fg.c +1 -1
@@ -2749,7 +2749,7 @@ static int ab8500_fg_probe(struct platform_device *pdev)for (i =0 ; i <ARRAY_SIZE (ab8500_fg_irq); i++) { irq =platform_get_irq_byname (pdev, ab8500_fg_irq[i].name); ret =request_threaded_irq (irq,NULL , ab8500_fg_irq[i].isr, -IRQF_SHARED |IRQF_NO_SUSPEND , +IRQF_SHARED |IRQF_NO_SUSPEND |IRQF_ONESHOT , ab8500_fg_irq[i].name, di);if (ret !=0 ) {
drivers/power/lp8788-charger.c +1 -1
@@ -519,7 +519,7 @@ static int lp8788_set_irqs(struct platform_device *pdev, ret =request_threaded_irq (virq,NULL , lp8788_charger_irq_thread, -0 , name, pchg); +IRQF_ONESHOT , name, pchg);if (ret)break ; }
drivers/power/max17042_battery.c +2 -1
@@ -751,7 +751,8 @@ static int max17042_probe(struct i2c_client *client,if (client->irq) { ret =request_threaded_irq (client->irq,NULL , max17042_thread_handler, -IRQF_TRIGGER_FALLING , +IRQF_TRIGGER_FALLING + |IRQF_ONESHOT , chip->battery.name, chip);if (!ret) { reg =max17042_read_reg (client,MAX17042_CONFIG );
drivers/power/max8903_charger.c +9 -3
@@ -297,7 +297,9 @@ static int max8903_probe(struct platform_device *pdev)if (pdata->dc_valid) { ret =request_threaded_irq (gpio_to_irq (pdata->dok),NULL , max8903_dcin, -IRQF_TRIGGER_FALLING |IRQF_TRIGGER_RISING , +IRQF_TRIGGER_FALLING + |IRQF_TRIGGER_RISING + |IRQF_ONESHOT ,"MAX8903 DC IN" , data);if (ret) { dev_err(dev, "Cannot request irq %d for DC (%d)\n",
@@ -309,7 +311,9 @@ static int max8903_probe(struct platform_device *pdev)if (pdata->usb_valid) { ret =request_threaded_irq (gpio_to_irq (pdata->uok),NULL , max8903_usbin, -IRQF_TRIGGER_FALLING |IRQF_TRIGGER_RISING , +IRQF_TRIGGER_FALLING + |IRQF_TRIGGER_RISING + |IRQF_ONESHOT ,"MAX8903 USB IN" , data);if (ret) { dev_err(dev, "Cannot request irq %d for USB (%d)\n",
@@ -321,7 +325,9 @@ static int max8903_probe(struct platform_device *pdev)if (pdata->flt) { ret =request_threaded_irq (gpio_to_irq (pdata->flt),NULL , max8903_fault, -IRQF_TRIGGER_FALLING |IRQF_TRIGGER_RISING , +IRQF_TRIGGER_FALLING + |IRQF_TRIGGER_RISING + |IRQF_ONESHOT ,"MAX8903 Fault" , data);if (ret) { dev_err(dev, "Cannot request irq %d for Fault (%d)\n",
drivers/power/pm2301_charger.c +1 -1
@@ -967,7 +967,7 @@ static int __devinit pm2xxx_wall_charger_probe(struct i2c_client *i2c_client,/* Register interrupts */ ret =request_threaded_irq (pm2->pdata->irq_number,NULL , pm2xxx_charger_irq[0 ].isr, - pm2->pdata->irq_type, + pm2->pdata->irq_type |IRQF_ONESHOT , pm2xxx_charger_irq[0 ].name, pm2);if (ret !=0 ) {
drivers/power/smb347-charger.c +2 -1
@@ -842,7 +842,8 @@ static int smb347_irq_init(struct smb347_charger *smb, goto fail; ret =request_threaded_irq (irq,NULL , smb347_interrupt, -IRQF_TRIGGER_FALLING , client->name, smb); +IRQF_TRIGGER_FALLING |IRQF_ONESHOT , + client->name, smb);if (ret <0 ) goto fail_gpio;
drivers/power/wm831x_power.c +5 -3
@@ -567,7 +567,8 @@ static int wm831x_power_probe(struct platform_device *pdev) irq =wm831x_irq (wm831x,platform_get_irq_byname (pdev,"SYSLO" )); ret =request_threaded_irq (irq,NULL , wm831x_syslo_irq, -IRQF_TRIGGER_RISING ,"System power low" , +IRQF_TRIGGER_RISING |IRQF_ONESHOT , +"System power low" , power);if (ret !=0 ) { dev_err(&pdev->dev, "Failed to request SYSLO IRQ %d: %d\n",
@@ -577,7 +578,8 @@ static int wm831x_power_probe(struct platform_device *pdev) irq =wm831x_irq (wm831x,platform_get_irq_byname (pdev,"PWR SRC" )); ret =request_threaded_irq (irq,NULL , wm831x_pwr_src_irq, -IRQF_TRIGGER_RISING ,"Power source" , +IRQF_TRIGGER_RISING |IRQF_ONESHOT , +"Power source" , power);if (ret !=0 ) { dev_err(&pdev->dev, "Failed to request PWR SRC IRQ %d: %d\n",
@@ -590,7 +592,7 @@ static int wm831x_power_probe(struct platform_device *pdev)platform_get_irq_byname (pdev, wm831x_bat_irqs[i])); ret =request_threaded_irq (irq,NULL , wm831x_bat_irq, -IRQF_TRIGGER_RISING , +IRQF_TRIGGER_RISING |IRQF_ONESHOT , wm831x_bat_irqs[i], power);if (ret !=0 ) {
Signature · 1 line
1.7.9.5
Quoted 3 lines · Andrei Epure
Patch found using coccinelle.
Signed-off-by Andrei Epure <[email protected]>
Some of these may be false positives especially for PMICs - often the interrupts are guaranteed to be generated from the interrupt controller on the device which runs in thread context.
More generally though why not fix this in request_threaded_irq() itself, if there's no hard IRQ handler then add the flag transparently? It'd save boilerplate. Indeed I could've sworn someone did that...
Quoted 12 lines
-----Original Message-----
From: Andrei Epure [mailto:[email protected]]
Sent: Thursday, March 28, 2013 9:43 AM
To: [email protected]; [email protected]; Kim, Milo; [email protected]; [email protected]; [email protected]
Cc: Andrei Epure
Subject: [PATCH] power: passIRQF_ONESHOTtorequest_threaded_irq()Patch found using coccinelle.
Signed-off-by Andrei Epure <[email protected]>
Quoted 11 lines
--- drivers/power/ab8500_btemp.c | 2 +- drivers/power/ab8500_charger.c | 2 +- drivers/power/ab8500_fg.c | 2 +- drivers/power/lp8788-charger.c | 2 +- drivers/power/max17042_battery.c | 3 ++- drivers/power/max8903_charger.c | 12 +++++++++--- drivers/power/pm2301_charger.c | 2 +- drivers/power/smb347-charger.c | 3 ++- drivers/power/wm831x_power.c | 8 +++++--- 9 files changed, 23 insertions(+), 13 deletions(-)
Could you share what will happen without this patch?
Do you mean the IRQF_ONESHOT flag with a primary IRQ handler?
If yes, no need to handle this for lp8788-charger driver because it is a nested handler rather a default primary handler.
Handler function is replaced with irq_nested_primary_handler() on setting up the IRQ.
Thanks.
Regards,
Milo