|
@@ -100,7 +100,7 @@ static struct k8temp_data *k8temp_update_device(struct device *dev)
|
|
* Sysfs stuff
|
|
* Sysfs stuff
|
|
*/
|
|
*/
|
|
|
|
|
|
-static ssize_t show_name(struct device *dev, struct device_attribute
|
|
|
|
|
|
+static ssize_t name_show(struct device *dev, struct device_attribute
|
|
*devattr, char *buf)
|
|
*devattr, char *buf)
|
|
{
|
|
{
|
|
struct k8temp_data *data = dev_get_drvdata(dev);
|
|
struct k8temp_data *data = dev_get_drvdata(dev);
|
|
@@ -133,7 +133,7 @@ static SENSOR_DEVICE_ATTR_2(temp1_input, S_IRUGO, show_temp, NULL, 0, 0);
|
|
static SENSOR_DEVICE_ATTR_2(temp2_input, S_IRUGO, show_temp, NULL, 0, 1);
|
|
static SENSOR_DEVICE_ATTR_2(temp2_input, S_IRUGO, show_temp, NULL, 0, 1);
|
|
static SENSOR_DEVICE_ATTR_2(temp3_input, S_IRUGO, show_temp, NULL, 1, 0);
|
|
static SENSOR_DEVICE_ATTR_2(temp3_input, S_IRUGO, show_temp, NULL, 1, 0);
|
|
static SENSOR_DEVICE_ATTR_2(temp4_input, S_IRUGO, show_temp, NULL, 1, 1);
|
|
static SENSOR_DEVICE_ATTR_2(temp4_input, S_IRUGO, show_temp, NULL, 1, 1);
|
|
-static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
|
|
|
|
|
|
+static DEVICE_ATTR_RO(name);
|
|
|
|
|
|
static const struct pci_device_id k8temp_ids[] = {
|
|
static const struct pci_device_id k8temp_ids[] = {
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) },
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) },
|