Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 756d1e92 authored by Guenter Roeck's avatar Guenter Roeck Committed by Wim Van Sebroeck
Browse files

watchdog: da9052_wdt: Drop reference counting 



Reference counting is now implemented in the watchdog core and no longer
required in watchdog drivers.

Since it was implememented a no-op, and since the local memory is allocated
with devm_kzalloc(), the reference counting code in the driver really did
not really work anyway, and this patch effectively fixes a bug which could
cause a crash on unloading if the watchdog device was still open.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent b4ffb190

drivers/watchdog/da9052_wdt.c

+0 −24
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
struct da9052_wdt_data {

	struct watchdog_device wdt;

	struct da9052 *da9052;

	struct kref kref;

	unsigned long jpast;

};
@@ -51,10 +50,6 @@ static const struct { 
};





static void da9052_wdt_release_resources(struct kref *r)

{

}



static int da9052_wdt_set_timeout(struct watchdog_device *wdt_dev,

				  unsigned int timeout)

{
@@ -104,20 +99,6 @@ static int da9052_wdt_set_timeout(struct watchdog_device *wdt_dev, 
	return 0;

}



static void da9052_wdt_ref(struct watchdog_device *wdt_dev)

{

	struct da9052_wdt_data *driver_data = watchdog_get_drvdata(wdt_dev);



	kref_get(&driver_data->kref);

}



static void da9052_wdt_unref(struct watchdog_device *wdt_dev)

{

	struct da9052_wdt_data *driver_data = watchdog_get_drvdata(wdt_dev);



	kref_put(&driver_data->kref, da9052_wdt_release_resources);

}



static int da9052_wdt_start(struct watchdog_device *wdt_dev)

{

	return da9052_wdt_set_timeout(wdt_dev, wdt_dev->timeout);
@@ -170,8 +151,6 @@ static const struct watchdog_ops da9052_wdt_ops = { 
	.stop = da9052_wdt_stop,

	.ping = da9052_wdt_ping,

	.set_timeout = da9052_wdt_set_timeout,

	.ref = da9052_wdt_ref,

	.unref = da9052_wdt_unref,

};
@@ -198,8 +177,6 @@ static int da9052_wdt_probe(struct platform_device *pdev) 
	da9052_wdt->parent = &pdev->dev;

	watchdog_set_drvdata(da9052_wdt, driver_data);



	kref_init(&driver_data->kref);



	ret = da9052_reg_update(da9052, DA9052_CONTROL_D_REG,

				DA9052_CONTROLD_TWDSCALE, 0);

	if (ret < 0) {
@@ -225,7 +202,6 @@ static int da9052_wdt_remove(struct platform_device *pdev) 
	struct da9052_wdt_data *driver_data = platform_get_drvdata(pdev);



	watchdog_unregister_device(&driver_data->wdt);

	kref_put(&driver_data->kref, da9052_wdt_release_resources);



	return 0;

}