Skip to content

L
linux-davinci
Commit 46a2e71c authored by Jean Delvare's avatar Jean Delvare Committed by Mark M. Hoffman
Browse files
Options

hwmon/ds1621: Use dynamic sysfs callbacks 

This lets us get rid of macro-generated functions and shrinks the
driver size by about 8%.
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Cc: Aurelien Jarno <aurelien@aurel32.net>
parent 75819f01
Show whitespace changes
Inline Side-by-side
Showing with 48 additions and 54 deletions
drivers/hwmon/ds1621.c
View file @ 46a2e71c
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/hwmon.h> #include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/sysfs.h> #include <linux/sysfs.h>
...@@ -52,9 +53,11 @@ MODULE_PARM_DESC(polarity, "Output's polarity: 0 = active high, 1 = active low") ...@@ -52,9 +53,11 @@ MODULE_PARM_DESC(polarity, "Output's polarity: 0 = active high, 1 = active low")
#define DS1621_REG_CONFIG_DONE 0x80 #define DS1621_REG_CONFIG_DONE 0x80
/* The DS1621 registers */ /* The DS1621 registers */
#define DS1621_REG_TEMP 0xAA /* word, RO */ static const u8 DS1621_REG_TEMP[3] = {
#define DS1621_REG_TEMP_MIN 0xA2 /* word, RW */ 0xAA, /* input, word, RO */
#define DS1621_REG_TEMP_MAX 0xA1 /* word, RW */ 0xA2, /* min, word, RW */
0xA1, /* max, word, RW */
};
#define DS1621_REG_CONF 0xAC /* byte, RW */ #define DS1621_REG_CONF 0xAC /* byte, RW */
#define DS1621_COM_START 0xEE /* no data */ #define DS1621_COM_START 0xEE /* no data */
#define DS1621_COM_STOP 0x22 /* no data */ #define DS1621_COM_STOP 0x22 /* no data */
...@@ -75,7 +78,7 @@ struct ds1621_data { ...@@ -75,7 +78,7 @@ struct ds1621_data {
char valid; /* !=0 if following fields are valid */ char valid; /* !=0 if following fields are valid */
unsigned long last_updated; /* In jiffies */ unsigned long last_updated; /* In jiffies */
u16 temp, temp_min, temp_max; /* Register values, word */ u16 temp[3]; /* Register values, word */
u8 conf; /* Register encoding, combined */ u8 conf; /* Register encoding, combined */
}; };
...@@ -133,50 +136,47 @@ static void ds1621_init_client(struct i2c_client *client) ...@@ -133,50 +136,47 @@ static void ds1621_init_client(struct i2c_client *client)
i2c_smbus_write_byte(client, DS1621_COM_START); i2c_smbus_write_byte(client, DS1621_COM_START);
} }
#define show(value) \ static ssize_t show_temp(struct device *dev, struct device_attribute *da,
static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \ char *buf)
{ \ {
struct ds1621_data *data = ds1621_update_client(dev); \ struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
return sprintf(buf, "%d\n", LM75_TEMP_FROM_REG(data->value)); \ struct ds1621_data *data = ds1621_update_client(dev);
return sprintf(buf, "%d\n",
LM75_TEMP_FROM_REG(data->temp[attr->index]));
} }
show(temp); static ssize_t set_temp(struct device *dev, struct device_attribute *da,
show(temp_min); const char *buf, size_t count)
show(temp_max); {
struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
#define set_temp(suffix, value, reg) \ struct i2c_client *client = to_i2c_client(dev);
static ssize_t set_temp_##suffix(struct device *dev, struct device_attribute *attr, const char *buf, \ struct ds1621_data *data = ds1621_update_client(dev);
size_t count) \ u16 val = LM75_TEMP_TO_REG(simple_strtoul(buf, NULL, 10));
{ \
struct i2c_client *client = to_i2c_client(dev); \
struct ds1621_data *data = ds1621_update_client(dev); \
u16 val = LM75_TEMP_TO_REG(simple_strtoul(buf, NULL, 10)); \
\
mutex_lock(&data->update_lock); \
data->value = val; \
ds1621_write_value(client, reg, data->value); \
mutex_unlock(&data->update_lock); \
return count; \
}
set_temp(min, temp_min, DS1621_REG_TEMP_MIN); mutex_lock(&data->update_lock);
set_temp(max, temp_max, DS1621_REG_TEMP_MAX); data->temp[attr->index] = val;
ds1621_write_value(client, DS1621_REG_TEMP[attr->index],
data->temp[attr->index]);
mutex_unlock(&data->update_lock);
return count;
}
static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf) static ssize_t show_alarms(struct device *dev, struct device_attribute *da,
char *buf)
{ {
struct ds1621_data *data = ds1621_update_client(dev); struct ds1621_data *data = ds1621_update_client(dev);
return sprintf(buf, "%d\n", ALARMS_FROM_REG(data->conf)); return sprintf(buf, "%d\n", ALARMS_FROM_REG(data->conf));
} }
static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL); static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
static DEVICE_ATTR(temp1_input, S_IRUGO , show_temp, NULL); static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
static DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO , show_temp_min, set_temp_min); static SENSOR_DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO, show_temp, set_temp, 1);
static DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp_max, set_temp_max); static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp, set_temp, 2);
static struct attribute *ds1621_attributes[] = { static struct attribute *ds1621_attributes[] = {
&dev_attr_temp1_input.attr, &sensor_dev_attr_temp1_input.dev_attr.attr,
&dev_attr_temp1_min.attr, &sensor_dev_attr_temp1_min.dev_attr.attr,
&dev_attr_temp1_max.attr, &sensor_dev_attr_temp1_max.dev_attr.attr,
&dev_attr_alarms.attr, &dev_attr_alarms.attr,
NULL NULL
}; };
...@@ -200,7 +200,7 @@ static int ds1621_detect(struct i2c_adapter *adapter, int address, ...@@ -200,7 +200,7 @@ static int ds1621_detect(struct i2c_adapter *adapter, int address,
int conf, temp; int conf, temp;
struct i2c_client *client; struct i2c_client *client;
struct ds1621_data *data; struct ds1621_data *data;
int err = 0; int i, err = 0;
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA
| I2C_FUNC_SMBUS_WORD_DATA | I2C_FUNC_SMBUS_WORD_DATA
...@@ -230,16 +230,12 @@ static int ds1621_detect(struct i2c_adapter *adapter, int address, ...@@ -230,16 +230,12 @@ static int ds1621_detect(struct i2c_adapter *adapter, int address,
if (conf & DS1621_REG_CONFIG_NVB) if (conf & DS1621_REG_CONFIG_NVB)
goto exit_free; goto exit_free;
/* The 7 lowest bits of a temperature should always be 0. */ /* The 7 lowest bits of a temperature should always be 0. */
temp = ds1621_read_value(client, DS1621_REG_TEMP); for (i = 0; i < ARRAY_SIZE(data->temp); i++) {
if (temp & 0x007f) temp = ds1621_read_value(client, DS1621_REG_TEMP[i]);
goto exit_free;
temp = ds1621_read_value(client, DS1621_REG_TEMP_MIN);
if (temp & 0x007f)
goto exit_free;
temp = ds1621_read_value(client, DS1621_REG_TEMP_MAX);
if (temp & 0x007f) if (temp & 0x007f)
goto exit_free; goto exit_free;
} }
}
/* Fill in remaining client fields and put it into the global list */ /* Fill in remaining client fields and put it into the global list */
strlcpy(client->name, "ds1621", I2C_NAME_SIZE); strlcpy(client->name, "ds1621", I2C_NAME_SIZE);
...@@ -301,23 +297,21 @@ static struct ds1621_data *ds1621_update_client(struct device *dev) ...@@ -301,23 +297,21 @@ static struct ds1621_data *ds1621_update_client(struct device *dev)
if (time_after(jiffies, data->last_updated + HZ + HZ / 2) if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
|| !data->valid) { || !data->valid) {
int i;
dev_dbg(&client->dev, "Starting ds1621 update\n"); dev_dbg(&client->dev, "Starting ds1621 update\n");
data->conf = ds1621_read_value(client, DS1621_REG_CONF); data->conf = ds1621_read_value(client, DS1621_REG_CONF);
data->temp = ds1621_read_value(client, DS1621_REG_TEMP); for (i = 0; i < ARRAY_SIZE(data->temp); i++)
data->temp[i] = ds1621_read_value(client,
data->temp_min = ds1621_read_value(client, DS1621_REG_TEMP[i]);
DS1621_REG_TEMP_MIN);
data->temp_max = ds1621_read_value(client,
DS1621_REG_TEMP_MAX);
/* reset alarms if necessary */ /* reset alarms if necessary */
new_conf = data->conf; new_conf = data->conf;
if (data->temp > data->temp_min) if (data->temp[0] > data->temp[1]) /* input > min */
new_conf &= ~DS1621_ALARM_TEMP_LOW; new_conf &= ~DS1621_ALARM_TEMP_LOW;
if (data->temp < data->temp_max) if (data->temp[0] < data->temp[2]) /* input < max */
new_conf &= ~DS1621_ALARM_TEMP_HIGH; new_conf &= ~DS1621_ALARM_TEMP_HIGH;
if (data->conf != new_conf) if (data->conf != new_conf)
ds1621_write_value(client, DS1621_REG_CONF, ds1621_write_value(client, DS1621_REG_CONF,
......
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