Skip to content

L
linux
Commit 1a86c051 authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman
Browse files
Options

[PATCH] I2C: lm83 uses new sysfs callbacks 

I updated the lm83 hardware monitoring driver to take benefit of Yani
Ioannou's new sysfs callback capabilities.
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 30d7394b
Show whitespace changes
Inline Side-by-side
Showing with 77 additions and 80 deletions
drivers/i2c/chips/lm83.c
View file @ 1a86c051
/* /*
* lm83.c - Part of lm_sensors, Linux kernel modules for hardware * lm83.c - Part of lm_sensors, Linux kernel modules for hardware
* monitoring * monitoring
* Copyright (C) 2003 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2003-2005 Jean Delvare <khali@linux-fr.org>
* *
* Heavily inspired from the lm78, lm75 and adm1021 drivers. The LM83 is * Heavily inspired from the lm78, lm75 and adm1021 drivers. The LM83 is
* a sensor chip made by National Semiconductor. It reports up to four * a sensor chip made by National Semiconductor. It reports up to four
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-sensor.h> #include <linux/i2c-sensor.h>
#include <linux/i2c-sysfs.h>
/* /*
* Addresses to scan * Addresses to scan
...@@ -93,21 +94,20 @@ static const u8 LM83_REG_R_TEMP[] = { ...@@ -93,21 +94,20 @@ static const u8 LM83_REG_R_TEMP[] = {
LM83_REG_R_LOCAL_TEMP, LM83_REG_R_LOCAL_TEMP,
LM83_REG_R_REMOTE1_TEMP, LM83_REG_R_REMOTE1_TEMP,
LM83_REG_R_REMOTE2_TEMP, LM83_REG_R_REMOTE2_TEMP,
LM83_REG_R_REMOTE3_TEMP LM83_REG_R_REMOTE3_TEMP,
};
static const u8 LM83_REG_R_HIGH[] = {
LM83_REG_R_LOCAL_HIGH, LM83_REG_R_LOCAL_HIGH,
LM83_REG_R_REMOTE1_HIGH, LM83_REG_R_REMOTE1_HIGH,
LM83_REG_R_REMOTE2_HIGH, LM83_REG_R_REMOTE2_HIGH,
LM83_REG_R_REMOTE3_HIGH LM83_REG_R_REMOTE3_HIGH,
LM83_REG_R_TCRIT,
}; };
static const u8 LM83_REG_W_HIGH[] = { static const u8 LM83_REG_W_HIGH[] = {
LM83_REG_W_LOCAL_HIGH, LM83_REG_W_LOCAL_HIGH,
LM83_REG_W_REMOTE1_HIGH, LM83_REG_W_REMOTE1_HIGH,
LM83_REG_W_REMOTE2_HIGH, LM83_REG_W_REMOTE2_HIGH,
LM83_REG_W_REMOTE3_HIGH LM83_REG_W_REMOTE3_HIGH,
LM83_REG_W_TCRIT,
}; };
/* /*
...@@ -143,9 +143,9 @@ struct lm83_data { ...@@ -143,9 +143,9 @@ struct lm83_data {
unsigned long last_updated; /* in jiffies */ unsigned long last_updated; /* in jiffies */
/* registers values */ /* registers values */
s8 temp_input[4]; s8 temp[9]; /* 0..3: input 1-4,
s8 temp_high[4]; 4..7: high limit 1-4,
s8 temp_crit; 8 : critical limit */
u16 alarms; /* bitvector, combined */ u16 alarms; /* bitvector, combined */
}; };
...@@ -153,65 +153,55 @@ struct lm83_data { ...@@ -153,65 +153,55 @@ struct lm83_data {
* Sysfs stuff * Sysfs stuff
*/ */
#define show_temp(suffix, value) \ static ssize_t show_temp(struct device *dev, struct device_attribute *devattr,
static ssize_t show_temp_##suffix(struct device *dev, struct device_attribute *attr, char *buf) \ char *buf)
{ \ {
struct lm83_data *data = lm83_update_device(dev); \ struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->value)); \ struct lm83_data *data = lm83_update_device(dev);
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[attr->index]));
} }
show_temp(input1, temp_input[0]);
show_temp(input2, temp_input[1]); static ssize_t set_temp(struct device *dev, struct device_attribute *devattr,
show_temp(input3, temp_input[2]); const char *buf, size_t count)
show_temp(input4, temp_input[3]); {
show_temp(high1, temp_high[0]); struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
show_temp(high2, temp_high[1]); struct i2c_client *client = to_i2c_client(dev);
show_temp(high3, temp_high[2]); struct lm83_data *data = i2c_get_clientdata(client);
show_temp(high4, temp_high[3]); long val = simple_strtol(buf, NULL, 10);
show_temp(crit, temp_crit); int nr = attr->index;
#define set_temp(suffix, value, reg) \ down(&data->update_lock);
static ssize_t set_temp_##suffix(struct device *dev, struct device_attribute *attr, const char *buf, \ data->temp[nr] = TEMP_TO_REG(val);
size_t count) \ i2c_smbus_write_byte_data(client, LM83_REG_W_HIGH[nr - 4],
{ \ data->temp[nr]);
struct i2c_client *client = to_i2c_client(dev); \ up(&data->update_lock);
struct lm83_data *data = i2c_get_clientdata(client); \ return count;
long val = simple_strtol(buf, NULL, 10); \
\
down(&data->update_lock); \
data->value = TEMP_TO_REG(val); \
i2c_smbus_write_byte_data(client, reg, data->value); \
up(&data->update_lock); \
return count; \
} }
set_temp(high1, temp_high[0], LM83_REG_W_LOCAL_HIGH);
set_temp(high2, temp_high[1], LM83_REG_W_REMOTE1_HIGH);
set_temp(high3, temp_high[2], LM83_REG_W_REMOTE2_HIGH);
set_temp(high4, temp_high[3], LM83_REG_W_REMOTE3_HIGH);
set_temp(crit, temp_crit, LM83_REG_W_TCRIT);
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 *dummy,
char *buf)
{ {
struct lm83_data *data = lm83_update_device(dev); struct lm83_data *data = lm83_update_device(dev);
return sprintf(buf, "%d\n", data->alarms); return sprintf(buf, "%d\n", data->alarms);
} }
static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp_input1, NULL); static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
static DEVICE_ATTR(temp2_input, S_IRUGO, show_temp_input2, NULL); static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp, NULL, 1);
static DEVICE_ATTR(temp3_input, S_IRUGO, show_temp_input3, NULL); static SENSOR_DEVICE_ATTR(temp3_input, S_IRUGO, show_temp, NULL, 2);
static DEVICE_ATTR(temp4_input, S_IRUGO, show_temp_input4, NULL); static SENSOR_DEVICE_ATTR(temp4_input, S_IRUGO, show_temp, NULL, 3);
static DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp_high1, static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp,
set_temp_high1); set_temp, 4);
static DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_temp_high2, static SENSOR_DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_temp,
set_temp_high2); set_temp, 5);
static DEVICE_ATTR(temp3_max, S_IWUSR | S_IRUGO, show_temp_high3, static SENSOR_DEVICE_ATTR(temp3_max, S_IWUSR | S_IRUGO, show_temp,
set_temp_high3); set_temp, 6);
static DEVICE_ATTR(temp4_max, S_IWUSR | S_IRUGO, show_temp_high4, static SENSOR_DEVICE_ATTR(temp4_max, S_IWUSR | S_IRUGO, show_temp,
set_temp_high4); set_temp, 7);
static DEVICE_ATTR(temp1_crit, S_IRUGO, show_temp_crit, NULL); static SENSOR_DEVICE_ATTR(temp1_crit, S_IRUGO, show_temp, NULL, 8);
static DEVICE_ATTR(temp2_crit, S_IRUGO, show_temp_crit, NULL); static SENSOR_DEVICE_ATTR(temp2_crit, S_IRUGO, show_temp, NULL, 8);
static DEVICE_ATTR(temp3_crit, S_IWUSR | S_IRUGO, show_temp_crit, static SENSOR_DEVICE_ATTR(temp3_crit, S_IWUSR | S_IRUGO, show_temp,
set_temp_crit); set_temp, 8);
static DEVICE_ATTR(temp4_crit, S_IRUGO, show_temp_crit, NULL); static SENSOR_DEVICE_ATTR(temp4_crit, S_IRUGO, show_temp, NULL, 8);
static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL); static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
/* /*
...@@ -322,18 +312,30 @@ static int lm83_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -322,18 +312,30 @@ static int lm83_detect(struct i2c_adapter *adapter, int address, int kind)
*/ */
/* Register sysfs hooks */ /* Register sysfs hooks */
device_create_file(&new_client->dev, &dev_attr_temp1_input); device_create_file(&new_client->dev,
device_create_file(&new_client->dev, &dev_attr_temp2_input); &sensor_dev_attr_temp1_input.dev_attr);
device_create_file(&new_client->dev, &dev_attr_temp3_input); device_create_file(&new_client->dev,
device_create_file(&new_client->dev, &dev_attr_temp4_input); &sensor_dev_attr_temp2_input.dev_attr);
device_create_file(&new_client->dev, &dev_attr_temp1_max); device_create_file(&new_client->dev,
device_create_file(&new_client->dev, &dev_attr_temp2_max); &sensor_dev_attr_temp3_input.dev_attr);
device_create_file(&new_client->dev, &dev_attr_temp3_max); device_create_file(&new_client->dev,
device_create_file(&new_client->dev, &dev_attr_temp4_max); &sensor_dev_attr_temp4_input.dev_attr);
device_create_file(&new_client->dev, &dev_attr_temp1_crit); device_create_file(&new_client->dev,
device_create_file(&new_client->dev, &dev_attr_temp2_crit); &sensor_dev_attr_temp1_max.dev_attr);
device_create_file(&new_client->dev, &dev_attr_temp3_crit); device_create_file(&new_client->dev,
device_create_file(&new_client->dev, &dev_attr_temp4_crit); &sensor_dev_attr_temp2_max.dev_attr);
device_create_file(&new_client->dev,
&sensor_dev_attr_temp3_max.dev_attr);
device_create_file(&new_client->dev,
&sensor_dev_attr_temp4_max.dev_attr);
device_create_file(&new_client->dev,
&sensor_dev_attr_temp1_crit.dev_attr);
device_create_file(&new_client->dev,
&sensor_dev_attr_temp2_crit.dev_attr);
device_create_file(&new_client->dev,
&sensor_dev_attr_temp3_crit.dev_attr);
device_create_file(&new_client->dev,
&sensor_dev_attr_temp4_crit.dev_attr);
device_create_file(&new_client->dev, &dev_attr_alarms); device_create_file(&new_client->dev, &dev_attr_alarms);
return 0; return 0;
...@@ -369,16 +371,11 @@ static struct lm83_data *lm83_update_device(struct device *dev) ...@@ -369,16 +371,11 @@ static struct lm83_data *lm83_update_device(struct device *dev)
int nr; int nr;
dev_dbg(&client->dev, "Updating lm83 data.\n"); dev_dbg(&client->dev, "Updating lm83 data.\n");
for (nr = 0; nr < 4 ; nr++) { for (nr = 0; nr < 9; nr++) {
data->temp_input[nr] = data->temp[nr] =
i2c_smbus_read_byte_data(client, i2c_smbus_read_byte_data(client,
LM83_REG_R_TEMP[nr]); LM83_REG_R_TEMP[nr]);
data->temp_high[nr] =
i2c_smbus_read_byte_data(client,
LM83_REG_R_HIGH[nr]);
} }
data->temp_crit =
i2c_smbus_read_byte_data(client, LM83_REG_R_TCRIT);
data->alarms = data->alarms =
i2c_smbus_read_byte_data(client, LM83_REG_R_STATUS1) i2c_smbus_read_byte_data(client, LM83_REG_R_STATUS1)
+ (i2c_smbus_read_byte_data(client, LM83_REG_R_STATUS2) + (i2c_smbus_read_byte_data(client, LM83_REG_R_STATUS2)
......
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