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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
hwmon
/
atxp1.c
diff --git
a/drivers/hwmon/atxp1.c
b/drivers/hwmon/atxp1.c
index
b0c4900
..
0ccdd07
100644
(file)
--- a/
drivers/hwmon/atxp1.c
+++ b/
drivers/hwmon/atxp1.c
@@
-26,6
+26,8
@@
#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>
+#include <linux/sysfs.h>
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("System voltages control via Attansic ATXP1");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("System voltages control via Attansic ATXP1");
@@
-60,7
+62,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
semaphore
update_lock;
+ struct
mutex
update_lock;
unsigned long last_updated;
u8 valid;
struct {
unsigned long last_updated;
u8 valid;
struct {
@@
-80,7
+82,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);
-
down
(&data->update_lock);
+
mutex_lock
(&data->update_lock);
if (time_after(jiffies, data->last_updated + HZ) || !data->valid) {
if (time_after(jiffies, data->last_updated + HZ) || !data->valid) {
@@
-93,7
+95,7
@@
static struct atxp1_data * atxp1_update_device(struct device *dev)
data->valid = 1;
}
data->valid = 1;
}
-
up
(&data->update_lock);
+
mutex_unlock
(&data->update_lock);
return(data);
}
return(data);
}
@@
-115,8
+117,7
@@
static ssize_t atxp1_storevcore(struct device *dev, struct device_attribute *att
{
struct atxp1_data *data;
struct i2c_client *client;
{
struct atxp1_data *data;
struct i2c_client *client;
- char vid;
- char cvid;
+ int vid, cvid;
unsigned int vcore;
client = to_i2c_client(dev);
unsigned int vcore;
client = to_i2c_client(dev);
@@
-250,6
+251,17
@@
static ssize_t atxp1_storegpio2(struct device *dev, struct device_attribute *att
*/
static DEVICE_ATTR(gpio2, S_IRUGO | S_IWUSR, atxp1_showgpio2, atxp1_storegpio2);
*/
static DEVICE_ATTR(gpio2, S_IRUGO | S_IWUSR, atxp1_showgpio2, atxp1_storegpio2);
+static struct attribute *atxp1_attributes[] = {
+ &dev_attr_gpio1.attr,
+ &dev_attr_gpio2.attr,
+ &dev_attr_cpu0_vid.attr,
+ NULL
+};
+
+static const struct attribute_group atxp1_group = {
+ .attrs = atxp1_attributes,
+};
+
static int atxp1_attach_adapter(struct i2c_adapter *adapter)
{
static int atxp1_attach_adapter(struct i2c_adapter *adapter)
{
@@
-309,7
+321,7
@@
static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind)
data->valid = 0;
data->valid = 0;
-
init_MUTEX
(&data->update_lock);
+
mutex_init
(&data->update_lock);
err = i2c_attach_client(new_client);
err = i2c_attach_client(new_client);
@@
-319,21
+331,23
@@
static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind)
goto exit_free;
}
goto exit_free;
}
+ /* Register sysfs hooks */
+ if ((err = sysfs_create_group(&new_client->dev.kobj, &atxp1_group)))
+ goto exit_detach;
+
data->class_dev = hwmon_device_register(&new_client->dev);
if (IS_ERR(data->class_dev)) {
err = PTR_ERR(data->class_dev);
data->class_dev = hwmon_device_register(&new_client->dev);
if (IS_ERR(data->class_dev)) {
err = PTR_ERR(data->class_dev);
- goto exit_
detach
;
+ goto exit_
remove_files
;
}
}
- device_create_file(&new_client->dev, &dev_attr_gpio1);
- device_create_file(&new_client->dev, &dev_attr_gpio2);
- device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
-
dev_info(&new_client->dev, "Using VRM: %d.%d\n",
data->vrm / 10, data->vrm % 10);
return 0;
dev_info(&new_client->dev, "Using VRM: %d.%d\n",
data->vrm / 10, data->vrm % 10);
return 0;
+exit_remove_files:
+ sysfs_remove_group(&new_client->dev.kobj, &atxp1_group);
exit_detach:
i2c_detach_client(new_client);
exit_free:
exit_detach:
i2c_detach_client(new_client);
exit_free:
@@
-348,6
+362,7
@@
static int atxp1_detach_client(struct i2c_client * client)
int err;
hwmon_device_unregister(data->class_dev);
int err;
hwmon_device_unregister(data->class_dev);
+ sysfs_remove_group(&client->dev.kobj, &atxp1_group);
err = i2c_detach_client(client);
err = i2c_detach_client(client);