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.o-hand.com/linux-rpurdie-leds
[powerpc.git]
/
drivers
/
hwmon
/
k8temp.c
diff --git
a/drivers/hwmon/k8temp.c
b/drivers/hwmon/k8temp.c
index
5d8d0ca
..
bd2bde0
100644
(file)
--- a/
drivers/hwmon/k8temp.c
+++ b/
drivers/hwmon/k8temp.c
@@
-38,7
+38,7
@@
#define SEL_CORE 0x04
struct k8temp_data {
#define SEL_CORE 0x04
struct k8temp_data {
- struct
class_device *class
_dev;
+ struct
device *hwmon
_dev;
struct mutex update_lock;
const char *name;
char valid; /* zero until following fields are valid */
struct mutex update_lock;
const char *name;
char valid; /* zero until following fields are valid */
@@
-225,10
+225,10
@@
static int __devinit k8temp_probe(struct pci_dev *pdev,
if (err)
goto exit_remove;
if (err)
goto exit_remove;
- data->
class
_dev = hwmon_device_register(&pdev->dev);
+ data->
hwmon
_dev = hwmon_device_register(&pdev->dev);
- if (IS_ERR(data->
class
_dev)) {
- err = PTR_ERR(data->
class
_dev);
+ if (IS_ERR(data->
hwmon
_dev)) {
+ err = PTR_ERR(data->
hwmon
_dev);
goto exit_remove;
}
goto exit_remove;
}
@@
-255,7
+255,7
@@
static void __devexit k8temp_remove(struct pci_dev *pdev)
{
struct k8temp_data *data = dev_get_drvdata(&pdev->dev);
{
struct k8temp_data *data = dev_get_drvdata(&pdev->dev);
- hwmon_device_unregister(data->
class
_dev);
+ hwmon_device_unregister(data->
hwmon
_dev);
device_remove_file(&pdev->dev,
&sensor_dev_attr_temp1_input.dev_attr);
device_remove_file(&pdev->dev,
device_remove_file(&pdev->dev,
&sensor_dev_attr_temp1_input.dev_attr);
device_remove_file(&pdev->dev,