These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / power / max8998_charger.c

diff --git a/kernel/drivers/power/max8998_charger.c b/kernel/drivers/power/max8998_charger.c
index 47448d4..b64cf0f 100644 (file)
--- a/kernel/drivers/power/max8998_charger.c
+++ b/kernel/drivers/power/max8998_charger.c
@@ -117,8 +117,7 @@ static int max8998_battery_probe(struct platform_device *pdev)
                        "EOC value not set: leave it unchanged.\n");
        } else {
                dev_err(max8998->dev, "Invalid EOC value\n");
-               ret = -EINVAL;
-               goto err;
+               return -EINVAL;
        }
 
        /* Setup Charge Restart Level */
@@ -141,8 +140,7 @@ static int max8998_battery_probe(struct platform_device *pdev)
                break;
        default:
                dev_err(max8998->dev, "Invalid Restart Level\n");
-               ret = -EINVAL;
-               goto err;
+               return -EINVAL;
        }
 
        /* Setup Charge Full Timeout */
@@ -165,33 +163,21 @@ static int max8998_battery_probe(struct platform_device *pdev)
                break;
        default:
                dev_err(max8998->dev, "Invalid Full Timeout value\n");
-               ret = -EINVAL;
-               goto err;
+               return -EINVAL;
        }
 
        psy_cfg.drv_data = max8998;
 
-       max8998->battery = power_supply_register(max8998->dev,
-                                                &max8998_battery_desc,
-                                                &psy_cfg);
+       max8998->battery = devm_power_supply_register(max8998->dev,
+                                                     &max8998_battery_desc,
+                                                     &psy_cfg);
        if (IS_ERR(max8998->battery)) {
                ret = PTR_ERR(max8998->battery);
                dev_err(max8998->dev, "failed: power supply register: %d\n",
                        ret);
-               goto err;
+               return ret;
        }
 
-       return 0;
-err:
-       return ret;
-}
-
-static int max8998_battery_remove(struct platform_device *pdev)
-{
-       struct max8998_battery_data *max8998 = platform_get_drvdata(pdev);
-
-       power_supply_unregister(max8998->battery);
-
        return 0;
 }
 
@@ -205,7 +191,6 @@ static struct platform_driver max8998_battery_driver = {
                .name = "max8998-battery",
        },
        .probe = max8998_battery_probe,
-       .remove = max8998_battery_remove,
        .id_table = max8998_battery_id,
 };