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
/
lm83.c
diff --git
a/drivers/hwmon/lm83.c
b/drivers/hwmon/lm83.c
index
aac4ec2
..
26dfa9e
100644
(file)
--- a/
drivers/hwmon/lm83.c
+++ b/
drivers/hwmon/lm83.c
@@
-35,7
+35,6
@@
#include <linux/hwmon-sysfs.h>
#include <linux/hwmon.h>
#include <linux/err.h>
#include <linux/hwmon-sysfs.h>
#include <linux/hwmon.h>
#include <linux/err.h>
-#include <linux/mutex.h>
/*
* Addresses to scan
/*
* Addresses to scan
@@
-140,7
+139,7
@@
static struct i2c_driver lm83_driver = {
struct lm83_data {
struct i2c_client client;
struct class_device *class_dev;
struct lm83_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 */
@@
-172,11
+171,11
@@
static ssize_t set_temp(struct device *dev, struct device_attribute *devattr,
long val = simple_strtol(buf, NULL, 10);
int nr = attr->index;
long val = simple_strtol(buf, NULL, 10);
int nr = attr->index;
-
mutex_lock
(&data->update_lock);
+
down
(&data->update_lock);
data->temp[nr] = TEMP_TO_REG(val);
i2c_smbus_write_byte_data(client, LM83_REG_W_HIGH[nr - 4],
data->temp[nr]);
data->temp[nr] = TEMP_TO_REG(val);
i2c_smbus_write_byte_data(client, LM83_REG_W_HIGH[nr - 4],
data->temp[nr]);
-
mutex_unlock
(&data->update_lock);
+
up
(&data->update_lock);
return count;
}
return count;
}
@@
-301,7
+300,7
@@
static int lm83_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)))
@@
-374,7
+373,7
@@
static struct lm83_data *lm83_update_device(struct device *dev)
struct i2c_client *client = to_i2c_client(dev);
struct lm83_data *data = i2c_get_clientdata(client);
struct i2c_client *client = to_i2c_client(dev);
struct lm83_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) {
int nr;
if (time_after(jiffies, data->last_updated + HZ * 2) || !data->valid) {
int nr;
@@
-394,7
+393,7
@@
static struct lm83_data *lm83_update_device(struct device *dev)
data->valid = 1;
}
data->valid = 1;
}
-
mutex_unlock
(&data->update_lock);
+
up
(&data->update_lock);
return data;
}
return data;
}