Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1295691

[PATCH 5/5] hwmon: (sch56xx) Drop watchdog driver data reference count callbacks

Show all headers | View raw

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

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
 drivers/hwmon/sch56xx-common.c | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/drivers/hwmon/sch56xx-common.c b/drivers/hwmon/sch56xx-common.c
index 738681983284..88dba68a9abb 100644
--- a/drivers/hwmon/sch56xx-common.c
+++ b/drivers/hwmon/sch56xx-common.c
@@ -30,7 +30,6 @@
 #include <linux/watchdog.h>
 #include <linux/miscdevice.h>
 #include <linux/uaccess.h>
-#include <linux/kref.h>
 #include <linux/slab.h>
 #include "sch56xx-common.h"
 
@@ -67,7 +66,6 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
 struct sch56xx_watchdog_data {
 	u16 addr;
 	struct mutex *io_lock;
-	struct kref kref;
 	struct watchdog_info wdinfo;
 	struct watchdog_device wddev;
 	u8 watchdog_preset;
@@ -258,15 +256,6 @@ EXPORT_SYMBOL(sch56xx_read_virtual_reg12);
  * Watchdog routines
  */
 
-/* Release our data struct when we're unregistered *and*
-   all references to our watchdog device are released */
-static void watchdog_release_resources(struct kref *r)
-{
-	struct sch56xx_watchdog_data *data =
-		container_of(r, struct sch56xx_watchdog_data, kref);
-	kfree(data);
-}
-
 static int watchdog_set_timeout(struct watchdog_device *wddev,
 				unsigned int timeout)
 {
@@ -395,28 +384,12 @@ static int watchdog_stop(struct watchdog_device *wddev)
 	return 0;
 }
 
-static void watchdog_ref(struct watchdog_device *wddev)
-{
-	struct sch56xx_watchdog_data *data = watchdog_get_drvdata(wddev);
-
-	kref_get(&data->kref);
-}
-
-static void watchdog_unref(struct watchdog_device *wddev)
-{
-	struct sch56xx_watchdog_data *data = watchdog_get_drvdata(wddev);
-
-	kref_put(&data->kref, watchdog_release_resources);
-}
-
 static const struct watchdog_ops watchdog_ops = {
 	.owner		= THIS_MODULE,
 	.start		= watchdog_start,
 	.stop		= watchdog_stop,
 	.ping		= watchdog_trigger,
 	.set_timeout	= watchdog_set_timeout,
-	.ref		= watchdog_ref,
-	.unref		= watchdog_unref,
 };
 
 struct sch56xx_watchdog_data *sch56xx_watchdog_register(struct device *parent,
@@ -448,7 +421,6 @@ struct sch56xx_watchdog_data *sch56xx_watchdog_register(struct device *parent,
 
 	data->addr = addr;
 	data->io_lock = io_lock;
-	kref_init(&data->kref);
 
 	strlcpy(data->wdinfo.identity, "sch56xx watchdog",
 		sizeof(data->wdinfo.identity));
@@ -494,8 +466,6 @@ EXPORT_SYMBOL(sch56xx_watchdog_register);
 void sch56xx_watchdog_unregister(struct sch56xx_watchdog_data *data)
 {
 	watchdog_unregister_device(&data->wddev);
-	kref_put(&data->kref, watchdog_release_resources);
-	/* Don't touch data after this it may have been free-ed! */
 }
 EXPORT_SYMBOL(sch56xx_watchdog_unregister);
 
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/5] watchdog: Replace driver based refcounting Guenter Roeck <linux@roeck-us.net> - 2015-12-20 22:10 +0100
  [PATCH 5/5] hwmon: (sch56xx) Drop watchdog driver data reference count callbacks Guenter Roeck <linux@roeck-us.net> - 2015-12-20 22:10 +0100
    Re: [PATCH 5/5] hwmon: (sch56xx) Drop watchdog driver data reference  count callbacks Hans de Goede <hdegoede@redhat.com> - 2015-12-21 11:40 +0100
      Re: [PATCH 5/5] hwmon: (sch56xx) Drop watchdog driver data reference  count callbacks Guenter Roeck <linux@roeck-us.net> - 2015-12-21 14:30 +0100
  [PATCH 2/5] watchdog: Separate and maintain variables based on variable lifetime Guenter Roeck <linux@roeck-us.net> - 2015-12-20 22:10 +0100
    Re: [PATCH 2/5] watchdog: Separate and maintain variables based on  variable lifetime Damien Riegel <damien.riegel@savoirfairelinux.com> - 2015-12-21 18:40 +0100
      Re: [PATCH 2/5] watchdog: Separate and maintain variables based on  variable lifetime Guenter Roeck <linux@roeck-us.net> - 2015-12-22 02:20 +0100
        Re: [PATCH 2/5] watchdog: Separate and maintain variables based on  variable lifetime Damien Riegel <damien.riegel@savoirfairelinux.com> - 2015-12-22 17:10 +0100
          Re: [PATCH 2/5] watchdog: Separate and maintain variables based on  variable lifetime Guenter Roeck <linux@roeck-us.net> - 2015-12-22 17:30 +0100
            Re: [PATCH 2/5] watchdog: Separate and maintain variables based on  variable lifetime Damien Riegel <damien.riegel@savoirfairelinux.com> - 2015-12-22 20:30 +0100
              Re: [PATCH 2/5] watchdog: Separate and maintain variables based on  variable lifetime Guenter Roeck <linux@roeck-us.net> - 2015-12-22 20:40 +0100
      Re: [PATCH 2/5] watchdog: Separate and maintain variables based on  variable lifetime Guenter Roeck <linux@roeck-us.net> - 2015-12-22 02:50 +0100
        Re: [PATCH 2/5] watchdog: Separate and maintain variables based on  variable lifetime Guenter Roeck <linux@roeck-us.net> - 2015-12-23 01:40 +0100

csiph-web