leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers: w1: add hwmon support structures

Browse Source 
This patch has changes to w1.h/w1.c generic files to add (optional) hwmon
support structures.

Signed-off-by: Jaghathiswari Rankappagounder Natarajan <jaghu@google.com>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jaghathiswari Rankappagounder Natarajan 2017-08-30 16:34:33 -07:00 committed by Greg Kroah-Hartman
parent db15d73e5f
commit 2eb7954809
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/w1/w1.c
View File

@ -25,6 +25,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/freezer.h> #include <linux/freezer.h>
#include <linux/hwmon.h>
#include <linux/atomic.h> #include <linux/atomic.h>
@ -649,9 +650,24 @@ static int w1_family_notify(unsigned long action, struct w1_slave *sl)
return err; return err;
} }
} }
if (IS_REACHABLE(CONFIG_HWMON) && fops->chip_info) {
struct device *hwmon
= hwmon_device_register_with_info(&sl->dev,
"w1_slave_temp", sl,
fops->chip_info,
NULL);
if (IS_ERR(hwmon)) {
dev_warn(&sl->dev,
"could not create hwmon device\n");
} else {
sl->hwmon = hwmon;
}
}
break; break;
case BUS_NOTIFY_DEL_DEVICE: case BUS_NOTIFY_DEL_DEVICE:
if (IS_REACHABLE(CONFIG_HWMON) && fops->chip_info &&
sl->hwmon)
hwmon_device_unregister(sl->hwmon);
if (fops->remove_slave) if (fops->remove_slave)
sl->family->fops->remove_slave(sl); sl->family->fops->remove_slave(sl);
if (fops->groups) if (fops->groups)

4
include/linux/w1.h
View File

@ -68,6 +68,7 @@ struct w1_reg_num {
* @family: module for device family type * @family: module for device family type
* @family_data: pointer for use by the family module * @family_data: pointer for use by the family module
* @dev: kernel device identifier * @dev: kernel device identifier
* @hwmon: pointer to hwmon device
* *
*/ */
struct w1_slave { struct w1_slave {
@ -83,6 +84,7 @@ struct w1_slave {
struct w1_family *family; struct w1_family *family;
void *family_data; void *family_data;
struct device dev; struct device dev;
struct device *hwmon;
}; };
typedef void (*w1_slave_found_callback)(struct w1_master *, u64); typedef void (*w1_slave_found_callback)(struct w1_master *, u64);
@ -250,11 +252,13 @@ void w1_remove_master_device(struct w1_bus_master *master);
* @add_slave: add_slave * @add_slave: add_slave
* @remove_slave: remove_slave * @remove_slave: remove_slave
* @groups: sysfs group * @groups: sysfs group
* @chip_info: pointer to struct hwmon_chip_info
*/ */
struct w1_family_ops { struct w1_family_ops {
int (*add_slave)(struct w1_slave *sl); int (*add_slave)(struct w1_slave *sl);
void (*remove_slave)(struct w1_slave *sl); void (*remove_slave)(struct w1_slave *sl);
const struct attribute_group **groups; const struct attribute_group **groups;
const struct hwmon_chip_info *chip_info;
}; };
/** /**