onkey->dev = &pdev->dev;
 
        onkey->regmap = dev_get_regmap(pdev->dev.parent, NULL);
-       if (!onkey->regmap) {
-               dev_err(&pdev->dev, "Parent regmap unavailable.\n");
-               return -ENXIO;
-       }
+       if (!onkey->regmap)
+               return dev_err_probe(&pdev->dev, -ENXIO,
+                                    "Parent regmap unavailable.\n");
 
        onkey->key_power = !of_property_read_bool(pdev->dev.of_node,
                                                  "dlg,disable-key-power");
                                          NULL, da9063_onkey_irq_handler,
                                          IRQF_TRIGGER_LOW | IRQF_ONESHOT,
                                          "ONKEY", onkey);
-       if (error) {
-               dev_err(&pdev->dev,
-                       "Failed to request IRQ %d: %d\n", irq, error);
-               return error;
-       }
+       if (error)
+               return dev_err_probe(&pdev->dev, error,
+                                    "Failed to allocate onkey IRQ\n");
 
        error = dev_pm_set_wake_irq(&pdev->dev, irq);
        if (error)