hwmon: (ftsteutates) Use devm_watchdog_register_device()
authorArmin Wolf <W_Armin@gmx.de>
Sat, 24 Dec 2022 04:18:55 +0000 (05:18 +0100)
committerGuenter Roeck <linux@roeck-us.net>
Fri, 3 Feb 2023 15:30:09 +0000 (07:30 -0800)
Use devm_watchdog_register_device() to let devres take care
of unregistering the watchdog at device removal. Remove the
now pointless fts_remove() function.

Tested on a Fujitsu DS3401-B1.

Signed-off-by: Armin Wolf <W_Armin@gmx.de>
Link: https://lore.kernel.org/r/20221224041855.83981-4-W_Armin@gmx.de
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/ftsteutates.c

index ffa0bb364877567a49d9156b3c4158ac14f0c0a5..e860924f90aa9506a8b30e29f77a87ffa5c48c81 100644 (file)
@@ -337,7 +337,7 @@ static int fts_watchdog_init(struct fts_data *data)
        /* max timeout 255 minutes. */
        data->wdd.max_hw_heartbeat_ms = 0xFF * 60 * MSEC_PER_SEC;
 
-       return watchdog_register_device(&data->wdd);
+       return devm_watchdog_register_device(&data->client->dev, &data->wdd);
 }
 
 /*****************************************************************************/
@@ -751,13 +751,6 @@ static int fts_detect(struct i2c_client *client,
        return 0;
 }
 
-static void fts_remove(struct i2c_client *client)
-{
-       struct fts_data *data = dev_get_drvdata(&client->dev);
-
-       watchdog_unregister_device(&data->wdd);
-}
-
 static int fts_probe(struct i2c_client *client)
 {
        u8 revision;
@@ -826,7 +819,6 @@ static struct i2c_driver fts_driver = {
        },
        .id_table = fts_id,
        .probe_new = fts_probe,
-       .remove = fts_remove,
        .detect = fts_detect,
        .address_list = normal_i2c,
 };