Skip to content

L
linux
Commit e84cfbcb authored by Jean Delvare's avatar Jean Delvare Committed by Jean Delvare
Browse files
Options

hwmon/smsc47m1: Use dynamic sysfs callbacks 

This lets us get rid of macro-generated functions and shrinks the
driver size by about 7%.
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent 620100cf
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 103 deletions
drivers/hwmon/smsc47m1.c
View file @ e84cfbcb
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/hwmon.h> #include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/mutex.h> #include <linux/mutex.h>
...@@ -157,11 +158,12 @@ static struct platform_driver smsc47m1_driver = { ...@@ -157,11 +158,12 @@ static struct platform_driver smsc47m1_driver = {
.remove = __devexit_p(smsc47m1_remove), .remove = __devexit_p(smsc47m1_remove),
}; };
/* nr is 0 or 1 in the callback functions below */ static ssize_t get_fan(struct device *dev, struct device_attribute
*devattr, char *buf)
static ssize_t get_fan(struct device *dev, char *buf, int nr)
{ {
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
struct smsc47m1_data *data = smsc47m1_update_device(dev, 0); struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);
int nr = attr->index;
/* This chip (stupidly) stops monitoring fan speed if PWM is /* This chip (stupidly) stops monitoring fan speed if PWM is
enabled and duty cycle is 0%. This is fine if the monitoring enabled and duty cycle is 0%. This is fine if the monitoring
and control concern the same fan, but troublesome if they are and control concern the same fan, but troublesome if they are
...@@ -173,42 +175,54 @@ static ssize_t get_fan(struct device *dev, char *buf, int nr) ...@@ -173,42 +175,54 @@ static ssize_t get_fan(struct device *dev, char *buf, int nr)
return sprintf(buf, "%d\n", rpm); return sprintf(buf, "%d\n", rpm);
} }
static ssize_t get_fan_min(struct device *dev, char *buf, int nr) static ssize_t get_fan_min(struct device *dev, struct device_attribute
*devattr, char *buf)
{ {
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
struct smsc47m1_data *data = smsc47m1_update_device(dev, 0); struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);
int nr = attr->index;
int rpm = MIN_FROM_REG(data->fan_preload[nr], int rpm = MIN_FROM_REG(data->fan_preload[nr],
DIV_FROM_REG(data->fan_div[nr])); DIV_FROM_REG(data->fan_div[nr]));
return sprintf(buf, "%d\n", rpm); return sprintf(buf, "%d\n", rpm);
} }
static ssize_t get_fan_div(struct device *dev, char *buf, int nr) static ssize_t get_fan_div(struct device *dev, struct device_attribute
*devattr, char *buf)
{ {
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
struct smsc47m1_data *data = smsc47m1_update_device(dev, 0); struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);
return sprintf(buf, "%d\n", DIV_FROM_REG(data->fan_div[nr])); return sprintf(buf, "%d\n", DIV_FROM_REG(data->fan_div[attr->index]));
} }
static ssize_t get_pwm(struct device *dev, char *buf, int nr) static ssize_t get_pwm(struct device *dev, struct device_attribute
*devattr, char *buf)
{ {
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
struct smsc47m1_data *data = smsc47m1_update_device(dev, 0); struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);
return sprintf(buf, "%d\n", PWM_FROM_REG(data->pwm[nr])); return sprintf(buf, "%d\n", PWM_FROM_REG(data->pwm[attr->index]));
} }
static ssize_t get_pwm_en(struct device *dev, char *buf, int nr) static ssize_t get_pwm_en(struct device *dev, struct device_attribute
*devattr, char *buf)
{ {
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
struct smsc47m1_data *data = smsc47m1_update_device(dev, 0); struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);
return sprintf(buf, "%d\n", PWM_EN_FROM_REG(data->pwm[nr])); return sprintf(buf, "%d\n", PWM_EN_FROM_REG(data->pwm[attr->index]));
} }
static ssize_t get_alarms(struct device *dev, struct device_attribute *attr, char *buf) static ssize_t get_alarms(struct device *dev, struct device_attribute
*devattr, char *buf)
{ {
struct smsc47m1_data *data = smsc47m1_update_device(dev, 0); struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);
return sprintf(buf, "%d\n", data->alarms); return sprintf(buf, "%d\n", data->alarms);
} }
static ssize_t set_fan_min(struct device *dev, const char *buf, static ssize_t set_fan_min(struct device *dev, struct device_attribute
size_t count, int nr) *devattr, const char *buf, size_t count)
{ {
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
struct smsc47m1_data *data = dev_get_drvdata(dev); struct smsc47m1_data *data = dev_get_drvdata(dev);
int nr = attr->index;
long rpmdiv, val = simple_strtol(buf, NULL, 10); long rpmdiv, val = simple_strtol(buf, NULL, 10);
mutex_lock(&data->update_lock); mutex_lock(&data->update_lock);
...@@ -231,11 +245,12 @@ static ssize_t set_fan_min(struct device *dev, const char *buf, ...@@ -231,11 +245,12 @@ static ssize_t set_fan_min(struct device *dev, const char *buf,
determined in part by the fan clock divider. This follows the principle determined in part by the fan clock divider. This follows the principle
of least surprise; the user doesn't expect the fan minimum to change just of least surprise; the user doesn't expect the fan minimum to change just
because the divider changed. */ because the divider changed. */
static ssize_t set_fan_div(struct device *dev, const char *buf, static ssize_t set_fan_div(struct device *dev, struct device_attribute
size_t count, int nr) *devattr, const char *buf, size_t count)
{ {
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
struct smsc47m1_data *data = dev_get_drvdata(dev); struct smsc47m1_data *data = dev_get_drvdata(dev);
int nr = attr->index;
long new_div = simple_strtol(buf, NULL, 10), tmp; long new_div = simple_strtol(buf, NULL, 10), tmp;
u8 old_div = DIV_FROM_REG(data->fan_div[nr]); u8 old_div = DIV_FROM_REG(data->fan_div[nr]);
...@@ -279,11 +294,12 @@ static ssize_t set_fan_div(struct device *dev, const char *buf, ...@@ -279,11 +294,12 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
return count; return count;
} }
static ssize_t set_pwm(struct device *dev, const char *buf, static ssize_t set_pwm(struct device *dev, struct device_attribute
size_t count, int nr) *devattr, const char *buf, size_t count)
{ {
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
struct smsc47m1_data *data = dev_get_drvdata(dev); struct smsc47m1_data *data = dev_get_drvdata(dev);
int nr = attr->index;
long val = simple_strtol(buf, NULL, 10); long val = simple_strtol(buf, NULL, 10);
if (val < 0 || val > 255) if (val < 0 || val > 255)
...@@ -299,11 +315,12 @@ static ssize_t set_pwm(struct device *dev, const char *buf, ...@@ -299,11 +315,12 @@ static ssize_t set_pwm(struct device *dev, const char *buf,
return count; return count;
} }
static ssize_t set_pwm_en(struct device *dev, const char *buf, static ssize_t set_pwm_en(struct device *dev, struct device_attribute
size_t count, int nr) *devattr, const char *buf, size_t count)
{ {
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
struct smsc47m1_data *data = dev_get_drvdata(dev); struct smsc47m1_data *data = dev_get_drvdata(dev);
int nr = attr->index;
long val = simple_strtol(buf, NULL, 10); long val = simple_strtol(buf, NULL, 10);
if (val != 0 && val != 1) if (val != 0 && val != 1)
...@@ -320,56 +337,16 @@ static ssize_t set_pwm_en(struct device *dev, const char *buf, ...@@ -320,56 +337,16 @@ static ssize_t set_pwm_en(struct device *dev, const char *buf,
} }
#define fan_present(offset) \ #define fan_present(offset) \
static ssize_t get_fan##offset (struct device *dev, struct device_attribute *attr, char *buf) \ static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO, get_fan, \
{ \ NULL, offset - 1); \
return get_fan(dev, buf, offset - 1); \ static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \
} \ get_fan_min, set_fan_min, offset - 1); \
static ssize_t get_fan##offset##_min (struct device *dev, struct device_attribute *attr, char *buf) \ static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR, \
{ \ get_fan_div, set_fan_div, offset - 1); \
return get_fan_min(dev, buf, offset - 1); \ static SENSOR_DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR, \
} \ get_pwm, set_pwm, offset - 1); \
static ssize_t set_fan##offset##_min (struct device *dev, struct device_attribute *attr, \ static SENSOR_DEVICE_ATTR(pwm##offset##_enable, S_IRUGO | S_IWUSR, \
const char *buf, size_t count) \ get_pwm_en, set_pwm_en, offset - 1)
{ \
return set_fan_min(dev, buf, count, offset - 1); \
} \
static ssize_t get_fan##offset##_div (struct device *dev, struct device_attribute *attr, char *buf) \
{ \
return get_fan_div(dev, buf, offset - 1); \
} \
static ssize_t set_fan##offset##_div (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \
{ \
return set_fan_div(dev, buf, count, offset - 1); \
} \
static ssize_t get_pwm##offset (struct device *dev, struct device_attribute *attr, char *buf) \
{ \
return get_pwm(dev, buf, offset - 1); \
} \
static ssize_t set_pwm##offset (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \
{ \
return set_pwm(dev, buf, count, offset - 1); \
} \
static ssize_t get_pwm##offset##_en (struct device *dev, struct device_attribute *attr, char *buf) \
{ \
return get_pwm_en(dev, buf, offset - 1); \
} \
static ssize_t set_pwm##offset##_en (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \
{ \
return set_pwm_en(dev, buf, count, offset - 1); \
} \
static DEVICE_ATTR(fan##offset##_input, S_IRUGO, get_fan##offset, \
NULL); \
static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \
get_fan##offset##_min, set_fan##offset##_min); \
static DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR, \
get_fan##offset##_div, set_fan##offset##_div); \
static DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR, \
get_pwm##offset, set_pwm##offset); \
static DEVICE_ATTR(pwm##offset##_enable, S_IRUGO | S_IWUSR, \
get_pwm##offset##_en, set_pwm##offset##_en);
fan_present(1); fan_present(1);
fan_present(2); fan_present(2);
...@@ -390,22 +367,22 @@ static DEVICE_ATTR(name, S_IRUGO, show_name, NULL); ...@@ -390,22 +367,22 @@ static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
setup so we create them individually. It is still convenient to define a setup so we create them individually. It is still convenient to define a
group to remove them all at once. */ group to remove them all at once. */
static struct attribute *smsc47m1_attributes[] = { static struct attribute *smsc47m1_attributes[] = {
&dev_attr_fan1_input.attr, &sensor_dev_attr_fan1_input.dev_attr.attr,
&dev_attr_fan1_min.attr, &sensor_dev_attr_fan1_min.dev_attr.attr,
&dev_attr_fan1_div.attr, &sensor_dev_attr_fan1_div.dev_attr.attr,
&dev_attr_fan2_input.attr, &sensor_dev_attr_fan2_input.dev_attr.attr,
&dev_attr_fan2_min.attr, &sensor_dev_attr_fan2_min.dev_attr.attr,
&dev_attr_fan2_div.attr, &sensor_dev_attr_fan2_div.dev_attr.attr,
&dev_attr_fan3_input.attr, &sensor_dev_attr_fan3_input.dev_attr.attr,
&dev_attr_fan3_min.attr, &sensor_dev_attr_fan3_min.dev_attr.attr,
&dev_attr_fan3_div.attr, &sensor_dev_attr_fan3_div.dev_attr.attr,
&dev_attr_pwm1.attr, &sensor_dev_attr_pwm1.dev_attr.attr,
&dev_attr_pwm1_enable.attr, &sensor_dev_attr_pwm1_enable.dev_attr.attr,
&dev_attr_pwm2.attr, &sensor_dev_attr_pwm2.dev_attr.attr,
&dev_attr_pwm2_enable.attr, &sensor_dev_attr_pwm2_enable.dev_attr.attr,
&dev_attr_pwm3.attr, &sensor_dev_attr_pwm3.dev_attr.attr,
&dev_attr_pwm3_enable.attr, &sensor_dev_attr_pwm3_enable.dev_attr.attr,
&dev_attr_alarms.attr, &dev_attr_alarms.attr,
&dev_attr_name.attr, &dev_attr_name.attr,
...@@ -547,46 +524,61 @@ static int __devinit smsc47m1_probe(struct platform_device *pdev) ...@@ -547,46 +524,61 @@ static int __devinit smsc47m1_probe(struct platform_device *pdev)
/* Register sysfs hooks */ /* Register sysfs hooks */
if (fan1) { if (fan1) {
if ((err = device_create_file(dev, &dev_attr_fan1_input)) if ((err = device_create_file(dev,
|| (err = device_create_file(dev, &dev_attr_fan1_min)) &sensor_dev_attr_fan1_input.dev_attr))
|| (err = device_create_file(dev, &dev_attr_fan1_div))) || (err = device_create_file(dev,
&sensor_dev_attr_fan1_min.dev_attr))
|| (err = device_create_file(dev,
&sensor_dev_attr_fan1_div.dev_attr)))
goto error_remove_files; goto error_remove_files;
} else } else
dev_dbg(dev, "Fan 1 not enabled by hardware, skipping\n"); dev_dbg(dev, "Fan 1 not enabled by hardware, skipping\n");
if (fan2) { if (fan2) {
if ((err = device_create_file(dev, &dev_attr_fan2_input)) if ((err = device_create_file(dev,
|| (err = device_create_file(dev, &dev_attr_fan2_min)) &sensor_dev_attr_fan2_input.dev_attr))
|| (err = device_create_file(dev, &dev_attr_fan2_div))) || (err = device_create_file(dev,
&sensor_dev_attr_fan2_min.dev_attr))
|| (err = device_create_file(dev,
&sensor_dev_attr_fan2_div.dev_attr)))
goto error_remove_files; goto error_remove_files;
} else } else
dev_dbg(dev, "Fan 2 not enabled by hardware, skipping\n"); dev_dbg(dev, "Fan 2 not enabled by hardware, skipping\n");
if (fan3) { if (fan3) {
if ((err = device_create_file(dev, &dev_attr_fan3_input)) if ((err = device_create_file(dev,
|| (err = device_create_file(dev, &dev_attr_fan3_min)) &sensor_dev_attr_fan3_input.dev_attr))
|| (err = device_create_file(dev, &dev_attr_fan3_div))) || (err = device_create_file(dev,
&sensor_dev_attr_fan3_min.dev_attr))
|| (err = device_create_file(dev,
&sensor_dev_attr_fan3_div.dev_attr)))
goto error_remove_files; goto error_remove_files;
} else } else
dev_dbg(dev, "Fan 3 not enabled by hardware, skipping\n"); dev_dbg(dev, "Fan 3 not enabled by hardware, skipping\n");
if (pwm1) { if (pwm1) {
if ((err = device_create_file(dev, &dev_attr_pwm1)) if ((err = device_create_file(dev,
|| (err = device_create_file(dev, &dev_attr_pwm1_enable))) &sensor_dev_attr_pwm1.dev_attr))
|| (err = device_create_file(dev,
&sensor_dev_attr_pwm1_enable.dev_attr)))
goto error_remove_files; goto error_remove_files;
} else } else
dev_dbg(dev, "PWM 1 not enabled by hardware, skipping\n"); dev_dbg(dev, "PWM 1 not enabled by hardware, skipping\n");
if (pwm2) { if (pwm2) {
if ((err = device_create_file(dev, &dev_attr_pwm2)) if ((err = device_create_file(dev,
|| (err = device_create_file(dev, &dev_attr_pwm2_enable))) &sensor_dev_attr_pwm2.dev_attr))
|| (err = device_create_file(dev,
&sensor_dev_attr_pwm2_enable.dev_attr)))
goto error_remove_files; goto error_remove_files;
} else } else
dev_dbg(dev, "PWM 2 not enabled by hardware, skipping\n"); dev_dbg(dev, "PWM 2 not enabled by hardware, skipping\n");
if (pwm3) { if (pwm3) {
if ((err = device_create_file(dev, &dev_attr_pwm3)) if ((err = device_create_file(dev,
|| (err = device_create_file(dev, &dev_attr_pwm3_enable))) &sensor_dev_attr_pwm3.dev_attr))
|| (err = device_create_file(dev,
&sensor_dev_attr_pwm3_enable.dev_attr)))
goto error_remove_files; goto error_remove_files;
} else } else
dev_dbg(dev, "PWM 3 not enabled by hardware, skipping\n"); dev_dbg(dev, "PWM 3 not enabled by hardware, skipping\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7