projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
[powerpc.git]
/
drivers
/
hwmon
/
gl520sm.c
diff --git
a/drivers/hwmon/gl520sm.c
b/drivers/hwmon/gl520sm.c
index
80ae8d3
..
14e810f
100644
(file)
--- a/
drivers/hwmon/gl520sm.c
+++ b/
drivers/hwmon/gl520sm.c
@@
-26,8
+26,10
@@
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
/* Type of the extra sensor */
static unsigned short extra_sensor_type;
/* Type of the extra sensor */
static unsigned short extra_sensor_type;
@@
-36,10
+38,9
@@
MODULE_PARM_DESC(extra_sensor_type, "Type of extra sensor (0=autodetect, 1=tempe
/* Addresses to scan */
static unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
/* Addresses to scan */
static unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
/* Insmod parameters */
/* Insmod parameters */
-
SENSORS
_INSMOD_1(gl520sm);
+
I2C_CLIENT
_INSMOD_1(gl520sm);
/* Many GL520 constants specified below
One of the inputs can be configured as either temp or voltage.
/* Many GL520 constants specified below
One of the inputs can be configured as either temp or voltage.
@@
-109,10
+110,10
@@
static struct gl520_data *gl520_update_device(struct device *dev);
/* Driver data */
static struct i2c_driver gl520_driver = {
/* Driver data */
static struct i2c_driver gl520_driver = {
- .owner = THIS_MODULE,
- .name = "gl520sm",
+ .driver = {
+ .name = "gl520sm",
+ },
.id = I2C_DRIVERID_GL520,
.id = I2C_DRIVERID_GL520,
- .flags = I2C_DF_NOTIFY,
.attach_adapter = gl520_attach_adapter,
.detach_client = gl520_detach_client,
};
.attach_adapter = gl520_attach_adapter,
.detach_client = gl520_detach_client,
};
@@
-120,7
+121,8
@@
static struct i2c_driver gl520_driver = {
/* Client data */
struct gl520_data {
struct i2c_client client;
/* Client data */
struct gl520_data {
struct i2c_client client;
- struct semaphore update_lock;
+ struct class_device *class_dev;
+ struct mutex update_lock;
char valid; /* zero until the following fields are valid */
unsigned long last_updated; /* in jiffies */
char valid; /* zero until the following fields are valid */
unsigned long last_updated; /* in jiffies */
@@
-302,7
+304,7
@@
static ssize_t set_in_min(struct i2c_client *client, struct gl520_data *data, co
long v = simple_strtol(buf, NULL, 10);
u8 r;
long v = simple_strtol(buf, NULL, 10);
u8 r;
-
down
(&data->update_lock);
+
mutex_lock
(&data->update_lock);
if (n == 0)
r = VDD_TO_REG(v);
if (n == 0)
r = VDD_TO_REG(v);
@@
-316,7
+318,7
@@
static ssize_t set_in_min(struct i2c_client *client, struct gl520_data *data, co
else
gl520_write_value(client, reg, r);
else
gl520_write_value(client, reg, r);
-
up
(&data->update_lock);
+
mutex_unlock
(&data->update_lock);
return count;
}
return count;
}
@@
-330,7
+332,7
@@
static ssize_t set_in_max(struct i2c_client *client, struct gl520_data *data, co
else
r = IN_TO_REG(v);
else
r = IN_TO_REG(v);
-
down
(&data->update_lock);
+
mutex_lock
(&data->update_lock);
data->in_max[n] = r;
data->in_max[n] = r;
@@
-339,7
+341,7
@@
static ssize_t set_in_max(struct i2c_client *client, struct gl520_data *data, co
else
gl520_write_value(client, reg, r);
else
gl520_write_value(client, reg, r);
-
up
(&data->update_lock);
+
mutex_unlock
(&data->update_lock);
return count;
}
return count;
}
@@
-372,7
+374,7
@@
static ssize_t set_fan_min(struct i2c_client *client, struct gl520_data *data, c
unsigned long v = simple_strtoul(buf, NULL, 10);
u8 r;
unsigned long v = simple_strtoul(buf, NULL, 10);
u8 r;
-
down
(&data->update_lock);
+
mutex_lock
(&data->update_lock);
r = FAN_TO_REG(v, data->fan_div[n - 1]);
data->fan_min[n - 1] = r;
r = FAN_TO_REG(v, data->fan_div[n - 1]);
data->fan_min[n - 1] = r;
@@
-389,7
+391,7
@@
static ssize_t set_fan_min(struct i2c_client *client, struct gl520_data *data, c
data->beep_mask &= data->alarm_mask;
gl520_write_value(client, GL520_REG_BEEP_MASK, data->beep_mask);
data->beep_mask &= data->alarm_mask;
gl520_write_value(client, GL520_REG_BEEP_MASK, data->beep_mask);
-
up
(&data->update_lock);
+
mutex_unlock
(&data->update_lock);
return count;
}
return count;
}
@@
-408,7
+410,7
@@
static ssize_t set_fan_div(struct i2c_client *client, struct gl520_data *data, c
return -EINVAL;
}
return -EINVAL;
}
-
down
(&data->update_lock);
+
mutex_lock
(&data->update_lock);
data->fan_div[n - 1] = r;
if (n == 1)
data->fan_div[n - 1] = r;
if (n == 1)
@@
-416,7
+418,7
@@
static ssize_t set_fan_div(struct i2c_client *client, struct gl520_data *data, c
else
gl520_write_value(client, reg, (gl520_read_value(client, reg) & ~0x30) | (r << 4));
else
gl520_write_value(client, reg, (gl520_read_value(client, reg) & ~0x30) | (r << 4));
-
up
(&data->update_lock);
+
mutex_unlock
(&data->update_lock);
return count;
}
return count;
}
@@
-424,10
+426,10
@@
static ssize_t set_fan_off(struct i2c_client *client, struct gl520_data *data, c
{
u8 r = simple_strtoul(buf, NULL, 10)?1:0;
{
u8 r = simple_strtoul(buf, NULL, 10)?1:0;
-
down
(&data->update_lock);
+
mutex_lock
(&data->update_lock);
data->fan_off = r;
gl520_write_value(client, reg, (gl520_read_value(client, reg) & ~0x0c) | (r << 2));
data->fan_off = r;
gl520_write_value(client, reg, (gl520_read_value(client, reg) & ~0x0c) | (r << 2));
-
up
(&data->update_lock);
+
mutex_unlock
(&data->update_lock);
return count;
}
return count;
}
@@
-453,10
+455,10
@@
static ssize_t set_temp_max(struct i2c_client *client, struct gl520_data *data,
{
long v = simple_strtol(buf, NULL, 10);
{
long v = simple_strtol(buf, NULL, 10);
-
down
(&data->update_lock);
- data->temp_max[n - 1] = TEMP_TO_REG(v);
;
+
mutex_lock
(&data->update_lock);
+ data->temp_max[n - 1] = TEMP_TO_REG(v);
gl520_write_value(client, reg, data->temp_max[n - 1]);
gl520_write_value(client, reg, data->temp_max[n - 1]);
-
up
(&data->update_lock);
+
mutex_unlock
(&data->update_lock);
return count;
}
return count;
}
@@
-464,10
+466,10
@@
static ssize_t set_temp_max_hyst(struct i2c_client *client, struct gl520_data *d
{
long v = simple_strtol(buf, NULL, 10);
{
long v = simple_strtol(buf, NULL, 10);
-
down
(&data->update_lock);
+
mutex_lock
(&data->update_lock);
data->temp_max_hyst[n - 1] = TEMP_TO_REG(v);
gl520_write_value(client, reg, data->temp_max_hyst[n - 1]);
data->temp_max_hyst[n - 1] = TEMP_TO_REG(v);
gl520_write_value(client, reg, data->temp_max_hyst[n - 1]);
-
up
(&data->update_lock);
+
mutex_unlock
(&data->update_lock);
return count;
}
return count;
}
@@
-490,10
+492,10
@@
static ssize_t set_beep_enable(struct i2c_client *client, struct gl520_data *dat
{
u8 r = simple_strtoul(buf, NULL, 10)?0:1;
{
u8 r = simple_strtoul(buf, NULL, 10)?0:1;
-
down
(&data->update_lock);
+
mutex_lock
(&data->update_lock);
data->beep_enable = !r;
gl520_write_value(client, reg, (gl520_read_value(client, reg) & ~0x04) | (r << 2));
data->beep_enable = !r;
gl520_write_value(client, reg, (gl520_read_value(client, reg) & ~0x04) | (r << 2));
-
up
(&data->update_lock);
+
mutex_unlock
(&data->update_lock);
return count;
}
return count;
}
@@
-501,11
+503,11
@@
static ssize_t set_beep_mask(struct i2c_client *client, struct gl520_data *data,
{
u8 r = simple_strtoul(buf, NULL, 10);
{
u8 r = simple_strtoul(buf, NULL, 10);
-
down
(&data->update_lock);
+
mutex_lock
(&data->update_lock);
r &= data->alarm_mask;
data->beep_mask = r;
gl520_write_value(client, reg, r);
r &= data->alarm_mask;
data->beep_mask = r;
gl520_write_value(client, reg, r);
-
up
(&data->update_lock);
+
mutex_unlock
(&data->update_lock);
return count;
}
return count;
}
@@
-518,7
+520,7
@@
static int gl520_attach_adapter(struct i2c_adapter *adapter)
{
if (!(adapter->class & I2C_CLASS_HWMON))
return 0;
{
if (!(adapter->class & I2C_CLASS_HWMON))
return 0;
- return i2c_
detect
(adapter, &addr_data, gl520_detect);
+ return i2c_
probe
(adapter, &addr_data, gl520_detect);
}
static int gl520_detect(struct i2c_adapter *adapter, int address, int kind)
}
static int gl520_detect(struct i2c_adapter *adapter, int address, int kind)
@@
-535,11
+537,10
@@
static int gl520_detect(struct i2c_adapter *adapter, int address, int kind)
client structure, even though we cannot fill it completely yet.
But it allows us to access gl520_{read,write}_value. */
client structure, even though we cannot fill it completely yet.
But it allows us to access gl520_{read,write}_value. */
- if (!(data = k
m
alloc(sizeof(struct gl520_data), GFP_KERNEL))) {
+ if (!(data = k
z
alloc(sizeof(struct gl520_data), GFP_KERNEL))) {
err = -ENOMEM;
goto exit;
}
err = -ENOMEM;
goto exit;
}
- memset(data, 0, sizeof(struct gl520_data));
new_client = &data->client;
i2c_set_clientdata(new_client, data);
new_client = &data->client;
i2c_set_clientdata(new_client, data);
@@
-561,7
+562,7
@@
static int gl520_detect(struct i2c_adapter *adapter, int address, int kind)
/* Fill in the remaining client fields */
strlcpy(new_client->name, "gl520sm", I2C_NAME_SIZE);
data->valid = 0;
/* Fill in the remaining client fields */
strlcpy(new_client->name, "gl520sm", I2C_NAME_SIZE);
data->valid = 0;
-
init_MUTEX
(&data->update_lock);
+
mutex_init
(&data->update_lock);
/* Tell the I2C layer a new client has arrived */
if ((err = i2c_attach_client(new_client)))
/* Tell the I2C layer a new client has arrived */
if ((err = i2c_attach_client(new_client)))
@@
-571,6
+572,12
@@
static int gl520_detect(struct i2c_adapter *adapter, int address, int kind)
gl520_init_client(new_client);
/* Register sysfs hooks */
gl520_init_client(new_client);
/* Register sysfs hooks */
+ data->class_dev = hwmon_device_register(&new_client->dev);
+ if (IS_ERR(data->class_dev)) {
+ err = PTR_ERR(data->class_dev);
+ goto exit_detach;
+ }
+
device_create_file_vid(new_client, 0);
device_create_file_in(new_client, 0);
device_create_file_vid(new_client, 0);
device_create_file_in(new_client, 0);
@@
-592,6
+599,8
@@
static int gl520_detect(struct i2c_adapter *adapter, int address, int kind)
return 0;
return 0;
+exit_detach:
+ i2c_detach_client(new_client);
exit_free:
kfree(data);
exit:
exit_free:
kfree(data);
exit:
@@
-608,7
+617,7
@@
static void gl520_init_client(struct i2c_client *client)
conf = oldconf = gl520_read_value(client, GL520_REG_CONF);
data->alarm_mask = 0xff;
conf = oldconf = gl520_read_value(client, GL520_REG_CONF);
data->alarm_mask = 0xff;
- data->vrm =
i2c
_which_vrm();
+ data->vrm =
vid
_which_vrm();
if (extra_sensor_type == 1)
conf &= ~0x10;
if (extra_sensor_type == 1)
conf &= ~0x10;
@@
-639,15
+648,15
@@
static void gl520_init_client(struct i2c_client *client)
static int gl520_detach_client(struct i2c_client *client)
{
static int gl520_detach_client(struct i2c_client *client)
{
+ struct gl520_data *data = i2c_get_clientdata(client);
int err;
int err;
- if ((err = i2c_detach_client(client))) {
- dev_err(&client->dev, "Client deregistration failed, "
- "client not detached.\n");
+ hwmon_device_unregister(data->class_dev);
+
+ if ((err = i2c_detach_client(client)))
return err;
return err;
- }
- kfree(
i2c_get_clientdata(client)
);
+ kfree(
data
);
return 0;
}
return 0;
}
@@
-677,7
+686,7
@@
static struct gl520_data *gl520_update_device(struct device *dev)
struct gl520_data *data = i2c_get_clientdata(client);
int val;
struct gl520_data *data = i2c_get_clientdata(client);
int val;
-
down
(&data->update_lock);
+
mutex_lock
(&data->update_lock);
if (time_after(jiffies, data->last_updated + 2 * HZ) || !data->valid) {
if (time_after(jiffies, data->last_updated + 2 * HZ) || !data->valid) {
@@
-742,7
+751,7
@@
static struct gl520_data *gl520_update_device(struct device *dev)
data->valid = 1;
}
data->valid = 1;
}
-
up
(&data->update_lock);
+
mutex_unlock
(&data->update_lock);
return data;
}
return data;
}