hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hwmon: (sch56xx) Drop watchdog driver data reference count callbacks 

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>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Guenter Roeck 2015-12-25 16:01:45 -08:00 committed by Wim Van Sebroeck
parent 43f676ace2
commit 3b8d058cfe
1 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/hwmon/sch56xx-common.c
View File

@ -30,7 +30,6 @@
#include <linux/watchdog.h> #include <linux/watchdog.h>
#include <linux/miscdevice.h> #include <linux/miscdevice.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/kref.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "sch56xx-common.h" #include "sch56xx-common.h"
@ -67,7 +66,6 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
struct sch56xx_watchdog_data { struct sch56xx_watchdog_data {
u16 addr; u16 addr;
struct mutex *io_lock; struct mutex *io_lock;
struct kref kref;
struct watchdog_info wdinfo; struct watchdog_info wdinfo;
struct watchdog_device wddev; struct watchdog_device wddev;
u8 watchdog_preset; u8 watchdog_preset;
@ -258,15 +256,6 @@ EXPORT_SYMBOL(sch56xx_read_virtual_reg12);
* Watchdog routines * 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, static int watchdog_set_timeout(struct watchdog_device *wddev,
unsigned int timeout) unsigned int timeout)
{ {
@ -395,28 +384,12 @@ static int watchdog_stop(struct watchdog_device *wddev)
return 0; 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 = { static const struct watchdog_ops watchdog_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.start = watchdog_start, .start = watchdog_start,
.stop = watchdog_stop, .stop = watchdog_stop,
.ping = watchdog_trigger, .ping = watchdog_trigger,
.set_timeout = watchdog_set_timeout, .set_timeout = watchdog_set_timeout,
.ref = watchdog_ref,
.unref = watchdog_unref,
}; };
struct sch56xx_watchdog_data *sch56xx_watchdog_register(struct device *parent, 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->addr = addr;
data->io_lock = io_lock; data->io_lock = io_lock;
kref_init(&data->kref);
strlcpy(data->wdinfo.identity, "sch56xx watchdog", strlcpy(data->wdinfo.identity, "sch56xx watchdog",
sizeof(data->wdinfo.identity)); sizeof(data->wdinfo.identity));
@ -494,8 +466,7 @@ EXPORT_SYMBOL(sch56xx_watchdog_register);
void sch56xx_watchdog_unregister(struct sch56xx_watchdog_data *data) void sch56xx_watchdog_unregister(struct sch56xx_watchdog_data *data)
{ {
watchdog_unregister_device(&data->wddev); watchdog_unregister_device(&data->wddev);
kref_put(&data->kref, watchdog_release_resources); kfree(data);
/* Don't touch data after this it may have been free-ed! */
} }
EXPORT_SYMBOL(sch56xx_watchdog_unregister); EXPORT_SYMBOL(sch56xx_watchdog_unregister);