Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Armin Wolf <W_Armin@gmx.de>
To:     jdelvare@suse.com, linux@roeck-us.net
Cc:     linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/3] hwmon: (ftsteutates) Use devm_watchdog_register_device()
Date:   Sat, 24 Dec 2022 05:18:55 +0100
Message-Id: <20221224041855.83981-4-W_Armin@gmx.de>
In-Reply-To: <20221224041855.83981-1-W_Armin@gmx.de>
References: <20221224041855.83981-1-W_Armin@gmx.de>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:S6UXNNAY8rY=;S+0q/L4KlVSl1hCKyPxForzHkCd
 WzJTR/JjArww35upLCENkuqFOtlQWG3gfAKULKfRKqZsKoxMFGOMesDFcjIlNzhoKNEQa5FxX
 pUoqiKVtB2mIxgC4EAk12EkT6D/vs2LZ6L7Ydawq4PXNh5HoBLtNJZ7w/YNVzHPw0VNQw0ddE
 d9Z+r+dCM7YeVuSYg6Yw2RhxXtBzv2WcW5Oe0PCko6Y4WtUxsqLKvsgnGVCBBwb5L4W4F5NwH
 8kvQk6vBuJ2b23TKSpx6WsFSg1nVeNQUDS8BdRHDltux0zdVcAJbPMhmQ9gSwhrG5ZijT2yxq
 LFJ7H0yZLx7A2Oim1gVFRMUzE58IpanVGBLm3nmvtWDxZBRBdbWvf8PMmCsmUCBEqEZe0q2Ya
 CXKZ4wNA6W8fi+G/hzXF9dxr2dZABGbE5tHeqIo+8/BN5i7+Qzvqsqq0zDsG6o0zJay45cK+a
 g0neAgjzGYf/KfUCFiAflAts6C+Z/KXCpWVvOvfegJQi7yCqbcDTOMQdG2PBom8pdgu4nmrBN
 AzITE+MDnn6tUqhXRAX31z6zz3vwhl/geyp23v/NF4jdpfJsq1ZszSP9c1SrOAS7t6OR65155
 ReDn6kYydAuYJ1UWMBdVzKAfLu7OMAqfNpYQMZ2rpw27StZdj8DM4ZgNAeK3O/wl8cDnIOXCb
 Cv3MAQywmsuA4TAAzIxNpkZGzuGYAqVC4wf0VozsUqkf/XUCoBZIcCL7DT/9TGx6rXzjgHTW4
 buBzZjLSIIX7NyFFdhW4qsAeCvtszXA4FohYSTC7HRRm3f6jnfJgVHshvnpAPwdxSX3ZuEKyS
 kRz9F42EnVRQ6VW9dOqRSrrlE34JnZBpLMdkdgL8OhQD6pD/urLJPfFtNnQ9t5YofMGRE0LeL
 s0VfVif1w1WAitExu5z5/BAsLV2u9qB6p1wG6RdLyME6P+FHIifbtcGcCgDoo96A+zvXpXb+A
 WmD67kryh0UM6q9saar/QmSIl48=
Precedence: bulk

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>
=2D--
 drivers/hwmon/ftsteutates.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/hwmon/ftsteutates.c b/drivers/hwmon/ftsteutates.c
index 66ff8d69a0de..d8878b8d16bc 100644
=2D-- a/drivers/hwmon/ftsteutates.c
+++ b/drivers/hwmon/ftsteutates.c
@@ -333,7 +333,7 @@ static int fts_watchdog_init(struct fts_data *data)
 	/* max timeout 255 minutes. */
 	data->wdd.max_hw_heartbeat_ms =3D 0xFF * 60 * MSEC_PER_SEC;

-	return watchdog_register_device(&data->wdd);
+	return devm_watchdog_register_device(&data->client->dev, &data->wdd);
 }

 static umode_t fts_is_visible(const void *devdata, enum hwmon_sensor_type=
s type, u32 attr,
@@ -611,13 +611,6 @@ static int fts_detect(struct i2c_client *client,
 	return 0;
 }

-static void fts_remove(struct i2c_client *client)
-{
-	struct fts_data *data =3D dev_get_drvdata(&client->dev);
-
-	watchdog_unregister_device(&data->wdd);
-}
-
 static int fts_probe(struct i2c_client *client)
 {
 	u8 revision;
@@ -684,7 +677,6 @@ static struct i2c_driver fts_driver =3D {
 	},
 	.id_table =3D fts_id,
 	.probe_new =3D fts_probe,
-	.remove =3D fts_remove,
 	.detect =3D fts_detect,
 	.address_list =3D normal_i2c,
 };
=2D-
2.30.2