projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
[powerpc.git]
/
drivers
/
hwmon
/
smsc47m192.c
diff --git
a/drivers/hwmon/smsc47m192.c
b/drivers/hwmon/smsc47m192.c
index
d3a3ba0
..
b875526
100644
(file)
--- a/
drivers/hwmon/smsc47m192.c
+++ b/
drivers/hwmon/smsc47m192.c
@@
-97,7
+97,7
@@
static inline int TEMP_FROM_REG(s8 val)
struct smsc47m192_data {
struct i2c_client client;
struct smsc47m192_data {
struct i2c_client client;
- struct
class_device *class
_dev;
+ struct
device *hwmon
_dev;
struct mutex update_lock;
char valid; /* !=0 if following fields are valid */
unsigned long last_updated; /* In jiffies */
struct mutex update_lock;
char valid; /* !=0 if following fields are valid */
unsigned long last_updated; /* In jiffies */
@@
-334,7
+334,7
@@
static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
static ssize_t show_vrm(struct device *dev, struct device_attribute *attr,
char *buf)
{
static ssize_t show_vrm(struct device *dev, struct device_attribute *attr,
char *buf)
{
- struct smsc47m192_data *data =
smsc47m192_update_device
(dev);
+ struct smsc47m192_data *data =
dev_get_drvdata
(dev);
return sprintf(buf, "%d\n", data->vrm);
}
return sprintf(buf, "%d\n", data->vrm);
}
@@
-553,9
+553,9
@@
static int smsc47m192_detect(struct i2c_adapter *adapter, int address,
goto exit_remove_files;
}
goto exit_remove_files;
}
- data->
class
_dev = hwmon_device_register(&client->dev);
- if (IS_ERR(data->
class
_dev)) {
- err = PTR_ERR(data->
class
_dev);
+ data->
hwmon
_dev = hwmon_device_register(&client->dev);
+ if (IS_ERR(data->
hwmon
_dev)) {
+ err = PTR_ERR(data->
hwmon
_dev);
goto exit_remove_files;
}
goto exit_remove_files;
}
@@
-577,7
+577,7
@@
static int smsc47m192_detach_client(struct i2c_client *client)
struct smsc47m192_data *data = i2c_get_clientdata(client);
int err;
struct smsc47m192_data *data = i2c_get_clientdata(client);
int err;
- hwmon_device_unregister(data->
class
_dev);
+ hwmon_device_unregister(data->
hwmon
_dev);
sysfs_remove_group(&client->dev.kobj, &smsc47m192_group);
sysfs_remove_group(&client->dev.kobj, &smsc47m192_group_in4);
sysfs_remove_group(&client->dev.kobj, &smsc47m192_group);
sysfs_remove_group(&client->dev.kobj, &smsc47m192_group_in4);