regulator: wm831x: Pass the IRQF_ONESHOT flag

Since commit 1c6c69525b40 ("genirq: Reject bogus threaded irq requests")
threaded IRQs without a primary handler need to be requested with
IRQF_ONESHOT, otherwise the request will fail.

So pass the IRQF_ONESHOT flag in this case.

The semantic patch that makes this change is available
in scripts/coccinelle/misc/irqf_oneshot.cocci.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c
index 0d7e164..8cbb82c 100644 (file)
--- a/drivers/regulator/wm831x-dcdc.c
+++ b/drivers/regulator/wm831x-dcdc.c
@@ -533,7 +533,8 @@ static int wm831x_buckv_probe(struct platform_device *pdev)
        irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV"));
        ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
                                        wm831x_dcdc_uv_irq,
-                                       IRQF_TRIGGER_RISING, dcdc->name, dcdc);
+                                       IRQF_TRIGGER_RISING | IRQF_ONESHOT,
+                                       dcdc->name, dcdc);
        if (ret != 0) {
                dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n",
                        irq, ret);
@@ -543,7 +544,8 @@ static int wm831x_buckv_probe(struct platform_device *pdev)
        irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "HC"));
        ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
                                        wm831x_dcdc_oc_irq,
-                                       IRQF_TRIGGER_RISING, dcdc->name, dcdc);
+                                       IRQF_TRIGGER_RISING | IRQF_ONESHOT,
+                                       dcdc->name, dcdc);
        if (ret != 0) {
                dev_err(&pdev->dev, "Failed to request HC IRQ %d: %d\n",
                        irq, ret);
@@ -669,7 +671,8 @@ static int wm831x_buckp_probe(struct platform_device *pdev)
        irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV"));
        ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
                                        wm831x_dcdc_uv_irq,
-                                       IRQF_TRIGGER_RISING, dcdc->name, dcdc);
+                                       IRQF_TRIGGER_RISING | IRQF_ONESHOT,
+                                       dcdc->name, dcdc);
        if (ret != 0) {
                dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n",
                        irq, ret);
@@ -785,7 +788,8 @@ static int wm831x_boostp_probe(struct platform_device *pdev)
        irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV"));
        ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
                                        wm831x_dcdc_uv_irq,
-                                       IRQF_TRIGGER_RISING, dcdc->name,
+                                       IRQF_TRIGGER_RISING | IRQF_ONESHOT,
+                                       dcdc->name,
                                        dcdc);
        if (ret != 0) {
                dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n",

diff --git a/drivers/regulator/wm831x-isink.c b/drivers/regulator/wm831x-isink.c
index 1e88391..1442828 100644 (file)
--- a/drivers/regulator/wm831x-isink.c
+++ b/drivers/regulator/wm831x-isink.c
@@ -204,7 +204,8 @@ static int wm831x_isink_probe(struct platform_device *pdev)
        irq = wm831x_irq(wm831x, platform_get_irq(pdev, 0));
        ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
                                        wm831x_isink_irq,
-                                       IRQF_TRIGGER_RISING, isink->name,
+                                       IRQF_TRIGGER_RISING | IRQF_ONESHOT,
+                                       isink->name,
                                        isink);
        if (ret != 0) {
                dev_err(&pdev->dev, "Failed to request ISINK IRQ %d: %d\n",

diff --git a/drivers/regulator/wm831x-ldo.c b/drivers/regulator/wm831x-ldo.c
index 7ae2dc8..5a7b65e 100644 (file)
--- a/drivers/regulator/wm831x-ldo.c
+++ b/drivers/regulator/wm831x-ldo.c
@@ -287,7 +287,8 @@ static int wm831x_gp_ldo_probe(struct platform_device *pdev)
        irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV"));
        ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
                                        wm831x_ldo_uv_irq,
-                                       IRQF_TRIGGER_RISING, ldo->name,
+                                       IRQF_TRIGGER_RISING | IRQF_ONESHOT,
+                                       ldo->name,
                                        ldo);
        if (ret != 0) {
                dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n",
@@ -496,7 +497,8 @@ static int wm831x_aldo_probe(struct platform_device *pdev)
        irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV"));
        ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
                                        wm831x_ldo_uv_irq,
-                                       IRQF_TRIGGER_RISING, ldo->name, ldo);
+                                       IRQF_TRIGGER_RISING | IRQF_ONESHOT,
+                                       ldo->name, ldo);
        if (ret != 0) {
                dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n",
                        irq, ret);