diff options
| author | Jean Delvare <jdelvare@suse.de> | 2017-03-07 15:15:15 +0100 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2017-04-02 16:01:53 +0200 |
| commit | 5ba6bcbc335771c37d05b88cbfcad5441b57130b (patch) | |
| tree | 1a301acb5a1874ba93adbdd3c59d3b0d08b43db7 | |
| parent | dt: Add vendor prefix for Sensirion (diff) | |
| download | linux-5ba6bcbc335771c37d05b88cbfcad5441b57130b.tar.xz linux-5ba6bcbc335771c37d05b88cbfcad5441b57130b.zip | |
hwmon: Constify str parameter of hwmon_ops->read_string
The read_string callback is supposed to retrieve a pointer to a
constant string.
Signed-off-by: Jean Delvare <jdelvare@suse.de>
Reviewed-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| -rw-r--r-- | drivers/hwmon/hwmon.c | 2 | ||||
| -rw-r--r-- | include/linux/hwmon.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c index 28375d59cc36..dd6e17c1076b 100644 --- a/drivers/hwmon/hwmon.c +++ b/drivers/hwmon/hwmon.c @@ -186,7 +186,7 @@ static ssize_t hwmon_attr_show_string(struct device *dev, char *buf) { struct hwmon_device_attribute *hattr = to_hwmon_attr(devattr); - char *s; + const char *s; int ret; ret = hattr->ops->read_string(dev, hattr->type, hattr->attr, diff --git a/include/linux/hwmon.h b/include/linux/hwmon.h index 88b673749121..ceb751987c40 100644 --- a/include/linux/hwmon.h +++ b/include/linux/hwmon.h @@ -337,7 +337,7 @@ struct hwmon_ops { int (*read)(struct device *dev, enum hwmon_sensor_types type, u32 attr, int channel, long *val); int (*read_string)(struct device *dev, enum hwmon_sensor_types type, - u32 attr, int channel, char **str); + u32 attr, int channel, const char **str); int (*write)(struct device *dev, enum hwmon_sensor_types type, u32 attr, int channel, long val); }; |