1 files changed, 29 insertions, 44 deletions

diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c
index 167221c7628a..0243ba70107e 100644
--- a/drivers/hwmon/pwm-fan.c
+++ b/drivers/hwmon/pwm-fan.c
@@ -207,33 +207,44 @@ static int pwm_fan_of_get_cooling_data(struct device *dev,
         return 0;
 }
 
+static void pwm_fan_regulator_disable(void *data)
+{
+        regulator_disable(data);
+}
+
+static void pwm_fan_pwm_disable(void *data)
+{
+        pwm_disable(data);
+}
+
 static int pwm_fan_probe(struct platform_device *pdev)
 {
         struct thermal_cooling_device *cdev;
+        struct device *dev = &pdev->dev;
         struct pwm_fan_ctx *ctx;
         struct device *hwmon;
         int ret;
         struct pwm_state state = { };
 
-        ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
+        ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);
         if (!ctx)
                 return -ENOMEM;
 
         mutex_init(&ctx->lock);
 
-        ctx->pwm = devm_of_pwm_get(&pdev->dev, pdev->dev.of_node, NULL);
+        ctx->pwm = devm_of_pwm_get(dev, dev->of_node, NULL);
         if (IS_ERR(ctx->pwm)) {
                 ret = PTR_ERR(ctx->pwm);
 
                 if (ret != -EPROBE_DEFER)
-                        dev_err(&pdev->dev, "Could not get PWM: %d\n", ret);
+                        dev_err(dev, "Could not get PWM: %d\n", ret);
 
                 return ret;
         }
 
         platform_set_drvdata(pdev, ctx);
 
-        ctx->reg_en = devm_regulator_get_optional(&pdev->dev, "fan");
+        ctx->reg_en = devm_regulator_get_optional(dev, "fan");
         if (IS_ERR(ctx->reg_en)) {
                 if (PTR_ERR(ctx->reg_en) != -ENODEV)
                         return PTR_ERR(ctx->reg_en);
@@ -242,10 +253,11 @@ static int pwm_fan_probe(struct platform_device *pdev)
         } else {
                 ret = regulator_enable(ctx->reg_en);
                 if (ret) {
-                        dev_err(&pdev->dev,
-                                "Failed to enable fan supply: %d\n", ret);
+                        dev_err(dev, "Failed to enable fan supply: %d\n", ret);
                         return ret;
                 }
+                devm_add_action_or_reset(dev, pwm_fan_regulator_disable,
+                                         ctx->reg_en);
         }
 
         ctx->pwm_value = MAX_PWM;
@@ -257,62 +269,36 @@ static int pwm_fan_probe(struct platform_device *pdev)
 
         ret = pwm_apply_state(ctx->pwm, &state);
         if (ret) {
-                dev_err(&pdev->dev, "Failed to configure PWM\n");
-                goto err_reg_disable;
+                dev_err(dev, "Failed to configure PWM\n");
+                return ret;
         }
+        devm_add_action_or_reset(dev, pwm_fan_pwm_disable, ctx->pwm);
 
-        hwmon = devm_hwmon_device_register_with_groups(&pdev->dev, "pwmfan",
+        hwmon = devm_hwmon_device_register_with_groups(dev, "pwmfan",
                                                        ctx, pwm_fan_groups);
         if (IS_ERR(hwmon)) {
-                dev_err(&pdev->dev, "Failed to register hwmon device\n");
-                ret = PTR_ERR(hwmon);
-                goto err_pwm_disable;
+                dev_err(dev, "Failed to register hwmon device\n");
+                return PTR_ERR(hwmon);
         }
 
-        ret = pwm_fan_of_get_cooling_data(&pdev->dev, ctx);
+        ret = pwm_fan_of_get_cooling_data(dev, ctx);
         if (ret)
                 return ret;
 
         ctx->pwm_fan_state = ctx->pwm_fan_max_state;
         if (IS_ENABLED(CONFIG_THERMAL)) {
-                cdev = thermal_of_cooling_device_register(pdev->dev.of_node,
-                                                          "pwm-fan", ctx,
-                                                          &pwm_fan_cooling_ops);
+                cdev = devm_thermal_of_cooling_device_register(dev,
+                        dev->of_node, "pwm-fan", ctx, &pwm_fan_cooling_ops);
                 if (IS_ERR(cdev)) {
-                        dev_err(&pdev->dev,
+                        dev_err(dev,
                                 "Failed to register pwm-fan as cooling device");
-                        ret = PTR_ERR(cdev);
-                        goto err_pwm_disable;
+                        return PTR_ERR(cdev);
                 }
                 ctx->cdev = cdev;
                 thermal_cdev_update(cdev);
         }
 
         return 0;
-
-err_pwm_disable:
-        state.enabled = false;
-        pwm_apply_state(ctx->pwm, &state);
-
-err_reg_disable:
-        if (ctx->reg_en)
-                regulator_disable(ctx->reg_en);
-
-        return ret;
-}
-
-static int pwm_fan_remove(struct platform_device *pdev)
-{
-        struct pwm_fan_ctx *ctx = platform_get_drvdata(pdev);
-
-        thermal_cooling_device_unregister(ctx->cdev);
-        if (ctx->pwm_value)
-                pwm_disable(ctx->pwm);
-
-        if (ctx->reg_en)
-                regulator_disable(ctx->reg_en);
-
-        return 0;
 }
 
 #ifdef CONFIG_PM_SLEEP
@@ -380,7 +366,6 @@ MODULE_DEVICE_TABLE(of, of_pwm_fan_match);
 
 static struct platform_driver pwm_fan_driver = {
         .probe          = pwm_fan_probe,
-        .remove         = pwm_fan_remove,
         .driver = {
                 .name           = "pwm-fan",
                 .pm             = &pwm_fan_pm,