return ret;
 
        gpadc->irq_sw = platform_get_irq_byname(pdev, "SW_CONV_END");
-       if (gpadc->irq_sw < 0) {
-               dev_err(dev, "failed to get platform sw_conv_end irq\n");
-               return gpadc->irq_sw;
-       }
+       if (gpadc->irq_sw < 0)
+               return dev_err_probe(dev, gpadc->irq_sw,
+                                    "failed to get platform sw_conv_end irq\n");
 
        if (is_ab8500(gpadc->ab8500)) {
                gpadc->irq_hw = platform_get_irq_byname(pdev, "HW_CONV_END");
-               if (gpadc->irq_hw < 0) {
-                       dev_err(dev, "failed to get platform hw_conv_end irq\n");
-                       return gpadc->irq_hw;
-               }
+               if (gpadc->irq_hw < 0)
+                       return dev_err_probe(dev, gpadc->irq_hw,
+                                            "failed to get platform hw_conv_end irq\n");
        } else {
                gpadc->irq_hw = 0;
        }
 
        /* The VTVout LDO used to power the AB8500 GPADC */
        gpadc->vddadc = devm_regulator_get(dev, "vddadc");
-       if (IS_ERR(gpadc->vddadc)) {
-               ret = PTR_ERR(gpadc->vddadc);
-               dev_err(dev, "failed to get vddadc\n");
-               return ret;
-       }
+       if (IS_ERR(gpadc->vddadc))
+               return dev_err_probe(dev, PTR_ERR(gpadc->vddadc),
+                                    "failed to get vddadc\n");
 
        ret = regulator_enable(gpadc->vddadc);
        if (ret) {