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
/
atxp1.c
diff --git
a/drivers/hwmon/atxp1.c
b/drivers/hwmon/atxp1.c
index
728a1e8
..
b0c4900
100644
(file)
--- a/
drivers/hwmon/atxp1.c
+++ b/
drivers/hwmon/atxp1.c
@@
-26,7
+26,6
@@
#include <linux/hwmon.h>
#include <linux/hwmon-vid.h>
#include <linux/err.h>
#include <linux/hwmon.h>
#include <linux/hwmon-vid.h>
#include <linux/err.h>
-#include <linux/mutex.h>
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("System voltages control via Attansic ATXP1");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("System voltages control via Attansic ATXP1");
@@
-61,7
+60,7
@@
static struct i2c_driver atxp1_driver = {
struct atxp1_data {
struct i2c_client client;
struct class_device *class_dev;
struct atxp1_data {
struct i2c_client client;
struct class_device *class_dev;
- struct
mutex
update_lock;
+ struct
semaphore
update_lock;
unsigned long last_updated;
u8 valid;
struct {
unsigned long last_updated;
u8 valid;
struct {
@@
-81,7
+80,7
@@
static struct atxp1_data * atxp1_update_device(struct device *dev)
client = to_i2c_client(dev);
data = i2c_get_clientdata(client);
client = to_i2c_client(dev);
data = i2c_get_clientdata(client);
-
mutex_lock
(&data->update_lock);
+
down
(&data->update_lock);
if (time_after(jiffies, data->last_updated + HZ) || !data->valid) {
if (time_after(jiffies, data->last_updated + HZ) || !data->valid) {
@@
-94,7
+93,7
@@
static struct atxp1_data * atxp1_update_device(struct device *dev)
data->valid = 1;
}
data->valid = 1;
}
-
mutex_unlock
(&data->update_lock);
+
up
(&data->update_lock);
return(data);
}
return(data);
}
@@
-310,7
+309,7
@@
static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind)
data->valid = 0;
data->valid = 0;
-
mutex_init
(&data->update_lock);
+
init_MUTEX
(&data->update_lock);
err = i2c_attach_client(new_client);
err = i2c_attach_client(new_client);