| Message ID | 1555617500-10862-3-git-send-email-linux@roeck-us.net (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | thermal: Introduce devm_thermal_of_cooling_device_register | expand |
On Thu, Apr 18, 2019 at 12:58 PM Guenter Roeck <linux@roeck-us.net> wrote: > > Use devm_thermal_of_cooling_device_register() to register the cooling > device. As a side effect, this fixes a driver bug: > thermal_cooling_device_unregister() was not called on removal. > > Fixes: f198907d2ff6d ("hwmon: (aspeed-pwm-tacho) cooling device support.") > Cc: Mykola Kostenok <c_mykolak@mellanox.com> > Cc: Joel Stanley <joel@jms.id.au> > Signed-off-by: Guenter Roeck <linux@roeck-us.net> Reviewed-by: Patrick Venture <venture@google.com> > --- > drivers/hwmon/aspeed-pwm-tacho.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/hwmon/aspeed-pwm-tacho.c b/drivers/hwmon/aspeed-pwm-tacho.c > index c4dd6301e7c8..0daf0b32aa4a 100644 > --- a/drivers/hwmon/aspeed-pwm-tacho.c > +++ b/drivers/hwmon/aspeed-pwm-tacho.c > @@ -830,10 +830,8 @@ static int aspeed_create_pwm_cooling(struct device *dev, > } > snprintf(cdev->name, MAX_CDEV_NAME_LEN, "%pOFn%d", child, pwm_port); > > - cdev->tcdev = thermal_of_cooling_device_register(child, > - cdev->name, > - cdev, > - &aspeed_pwm_cool_ops); > + cdev->tcdev = devm_thermal_of_cooling_device_register(dev, child, > + cdev->name, cdev, &aspeed_pwm_cool_ops); > if (IS_ERR(cdev->tcdev)) > return PTR_ERR(cdev->tcdev); > > -- > 2.7.4 >
diff --git a/drivers/hwmon/aspeed-pwm-tacho.c b/drivers/hwmon/aspeed-pwm-tacho.c index c4dd6301e7c8..0daf0b32aa4a 100644 --- a/drivers/hwmon/aspeed-pwm-tacho.c +++ b/drivers/hwmon/aspeed-pwm-tacho.c @@ -830,10 +830,8 @@ static int aspeed_create_pwm_cooling(struct device *dev, } snprintf(cdev->name, MAX_CDEV_NAME_LEN, "%pOFn%d", child, pwm_port); - cdev->tcdev = thermal_of_cooling_device_register(child, - cdev->name, - cdev, - &aspeed_pwm_cool_ops); + cdev->tcdev = devm_thermal_of_cooling_device_register(dev, child, + cdev->name, cdev, &aspeed_pwm_cool_ops); if (IS_ERR(cdev->tcdev)) return PTR_ERR(cdev->tcdev);
Use devm_thermal_of_cooling_device_register() to register the cooling device. As a side effect, this fixes a driver bug: thermal_cooling_device_unregister() was not called on removal. Fixes: f198907d2ff6d ("hwmon: (aspeed-pwm-tacho) cooling device support.") Cc: Mykola Kostenok <c_mykolak@mellanox.com> Cc: Joel Stanley <joel@jms.id.au> Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- drivers/hwmon/aspeed-pwm-tacho.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)