mfd: Register ab8500 devices using the newly DT:ed MFD API

[cascardo/linux.git] / drivers / mfd / ab8500-gpadc.c

diff --git a/drivers/mfd/ab8500-gpadc.c b/drivers/mfd/ab8500-gpadc.c
index c39fc71..866f959 100644 (file)
--- a/drivers/mfd/ab8500-gpadc.c
+++ b/drivers/mfd/ab8500-gpadc.c
@@ -584,7 +584,7 @@ static int __devinit ab8500_gpadc_probe(struct platform_device *pdev)
 
        gpadc->irq = platform_get_irq_byname(pdev, "SW_CONV_END");
        if (gpadc->irq < 0) {
-               dev_err(gpadc->dev, "failed to get platform irq-%d\n",
+               dev_err(&pdev->dev, "failed to get platform irq-%d\n",
                        gpadc->irq);
                ret = gpadc->irq;
                goto fail;
@@ -599,7 +599,8 @@ static int __devinit ab8500_gpadc_probe(struct platform_device *pdev)
        /* Register interrupt  - SwAdcComplete */
        ret = request_threaded_irq(gpadc->irq, NULL,
                ab8500_bm_gpswadcconvend_handler,
-               IRQF_NO_SUSPEND | IRQF_SHARED, "ab8500-gpadc", gpadc);
+               IRQF_ONESHOT | IRQF_NO_SUSPEND | IRQF_SHARED,
+                               "ab8500-gpadc", gpadc);
        if (ret < 0) {
                dev_err(gpadc->dev, "Failed to register interrupt, irq: %d\n",
                        gpadc->irq);