git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
hwmon
/
max1619.c
diff --git
a/drivers/hwmon/max1619.c
b/drivers/hwmon/max1619.c
index
b4135b5
..
3abe330
100644
(file)
--- a/
drivers/hwmon/max1619.c
+++ b/
drivers/hwmon/max1619.c
@@
-33,7
+33,6
@@
#include <linux/i2c.h>
#include <linux/hwmon.h>
#include <linux/err.h>
#include <linux/i2c.h>
#include <linux/hwmon.h>
#include <linux/err.h>
-#include <linux/mutex.h>
static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a,
0x29, 0x2a, 0x2b,
static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a,
0x29, 0x2a, 0x2b,
@@
-105,7
+104,7
@@
static struct i2c_driver max1619_driver = {
struct max1619_data {
struct i2c_client client;
struct class_device *class_dev;
struct max1619_data {
struct i2c_client client;
struct class_device *class_dev;
- struct
mutex
update_lock;
+ struct
semaphore
update_lock;
char valid; /* zero until following fields are valid */
unsigned long last_updated; /* in jiffies */
char valid; /* zero until following fields are valid */
unsigned long last_updated; /* in jiffies */
@@
-142,10
+141,10
@@
static ssize_t set_##value(struct device *dev, struct device_attribute *attr, co
struct max1619_data *data = i2c_get_clientdata(client); \
long val = simple_strtol(buf, NULL, 10); \
\
struct max1619_data *data = i2c_get_clientdata(client); \
long val = simple_strtol(buf, NULL, 10); \
\
-
mutex_lock
(&data->update_lock); \
+
down
(&data->update_lock); \
data->value = TEMP_TO_REG(val); \
i2c_smbus_write_byte_data(client, reg, data->value); \
data->value = TEMP_TO_REG(val); \
i2c_smbus_write_byte_data(client, reg, data->value); \
-
mutex_unlock
(&data->update_lock); \
+
up
(&data->update_lock); \
return count; \
}
return count; \
}
@@
-263,7
+262,7
@@
static int max1619_detect(struct i2c_adapter *adapter, int address, int kind)
/* We can fill in the remaining client fields */
strlcpy(new_client->name, name, I2C_NAME_SIZE);
data->valid = 0;
/* We can fill in the remaining client fields */
strlcpy(new_client->name, name, I2C_NAME_SIZE);
data->valid = 0;
-
mutex_init
(&data->update_lock);
+
init_MUTEX
(&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)))
@@
-331,7
+330,7
@@
static struct max1619_data *max1619_update_device(struct device *dev)
struct i2c_client *client = to_i2c_client(dev);
struct max1619_data *data = i2c_get_clientdata(client);
struct i2c_client *client = to_i2c_client(dev);
struct max1619_data *data = i2c_get_clientdata(client);
-
mutex_lock
(&data->update_lock);
+
down
(&data->update_lock);
if (time_after(jiffies, data->last_updated + HZ * 2) || !data->valid) {
dev_dbg(&client->dev, "Updating max1619 data.\n");
if (time_after(jiffies, data->last_updated + HZ * 2) || !data->valid) {
dev_dbg(&client->dev, "Updating max1619 data.\n");
@@
-354,7
+353,7
@@
static struct max1619_data *max1619_update_device(struct device *dev)
data->valid = 1;
}
data->valid = 1;
}
-
mutex_unlock
(&data->update_lock);
+
up
(&data->update_lock);
return data;
}
return data;
}