power: supply: bq25890: Drop dev->platform_data == NULL check

Drop the "if (!dev->platform_data)" check, this seems to be an attempt
for allowing loading the driver on devices without devicetree stemming
from the initial commit of the driver (with the presumed intention being
the "return -ENODEV" else branch getting replaced with something else).

With the new "linux,skip-init" and "linux,read-back-settings" properties
the driver can actually supports devices without devicetree and this
check no longer makes sense.

While at it, also switch to dev_err_probe(), which is already used in
various other places in the driver.

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/drivers/power/supply/bq25890_charger.c b/drivers/power/supply/bq25890_charger.c
index d185299..548d1a7 100644 (file)
--- a/drivers/power/supply/bq25890_charger.c
+++ b/drivers/power/supply/bq25890_charger.c
@@ -1048,16 +1048,9 @@ static int bq25890_probe(struct i2c_client *client,
                return ret;
        }
 
-       if (!dev->platform_data) {
-               ret = bq25890_fw_probe(bq);
-               if (ret < 0) {
-                       dev_err(dev, "Cannot read device properties: %d\n",
-                               ret);
-                       return ret;
-               }
-       } else {
-               return -ENODEV;
-       }
+       ret = bq25890_fw_probe(bq);
+       if (ret < 0)
+               return dev_err_probe(dev, ret, "reading device properties\n");
 
        ret = bq25890_hw_init(bq);
        if (ret < 0) {