projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'nfs-for-2.6.40' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
hwmon
/
k8temp.c
diff --git
a/drivers/hwmon/k8temp.c
b/drivers/hwmon/k8temp.c
index 418496f13020ba58f57e23eece28417a48466aea..b923bc2307ad2e09758086daba616863bb2e1a00 100644
(file)
--- a/
drivers/hwmon/k8temp.c
+++ b/
drivers/hwmon/k8temp.c
@@
-252,7
+252,7
@@
static int __devinit k8temp_probe(struct pci_dev *pdev,
data->name = "k8temp";
mutex_init(&data->update_lock);
data->name = "k8temp";
mutex_init(&data->update_lock);
-
dev_set_drvdata(&pdev->
dev, data);
+
pci_set_drvdata(p
dev, data);
/* Register sysfs hooks */
err = device_create_file(&pdev->dev,
/* Register sysfs hooks */
err = device_create_file(&pdev->dev,
@@
-307,7
+307,7
@@
exit_remove:
&sensor_dev_attr_temp4_input.dev_attr);
device_remove_file(&pdev->dev, &dev_attr_name);
exit_free:
&sensor_dev_attr_temp4_input.dev_attr);
device_remove_file(&pdev->dev, &dev_attr_name);
exit_free:
-
dev_set_drvdata(&pdev->
dev, NULL);
+
pci_set_drvdata(p
dev, NULL);
kfree(data);
exit:
return err;
kfree(data);
exit:
return err;
@@
-315,7
+315,7
@@
exit:
static void __devexit k8temp_remove(struct pci_dev *pdev)
{
static void __devexit k8temp_remove(struct pci_dev *pdev)
{
- struct k8temp_data *data =
dev_get_drvdata(&pdev->
dev);
+ struct k8temp_data *data =
pci_get_drvdata(p
dev);
hwmon_device_unregister(data->hwmon_dev);
device_remove_file(&pdev->dev,
hwmon_device_unregister(data->hwmon_dev);
device_remove_file(&pdev->dev,
@@
-327,7
+327,7
@@
static void __devexit k8temp_remove(struct pci_dev *pdev)
device_remove_file(&pdev->dev,
&sensor_dev_attr_temp4_input.dev_attr);
device_remove_file(&pdev->dev, &dev_attr_name);
device_remove_file(&pdev->dev,
&sensor_dev_attr_temp4_input.dev_attr);
device_remove_file(&pdev->dev, &dev_attr_name);
-
dev_set_drvdata(&pdev->
dev, NULL);
+
pci_set_drvdata(p
dev, NULL);
kfree(data);
}
kfree(data);
}