Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 86c725e3c5a6baa5316787e0b017d8ac8b0facd8

Authored by Axel Lin
Committed by Jean Delvare
1 parent aef64d0d38
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

hwmon: (i5500_temp) Convert to use ATTRIBUTE_GROUPS macro 

Use ATTRIBUTE_GROUPS macro to simplify the code a bit.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Jean Delvare <jdelvare@suse.de>

Showing 1 changed file with 3 additions and 10 deletions Side-by-side Diff

drivers/hwmon/i5500_temp.c
Diff comments   View file @ 86c725e
... ... @@ -90,7 +90,7 @@
90 90 static SENSOR_DEVICE_ATTR(temp1_crit_alarm, S_IRUGO, show_alarm, NULL, 0);
91 91 static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, show_alarm, NULL, 1);
92 92  
93   -static struct attribute *i5500_temp_attributes[] = {
  93 +static struct attribute *i5500_temp_attrs[] = {
94 94 &dev_attr_temp1_input.attr,
95 95 &sensor_dev_attr_temp1_crit.dev_attr.attr,
96 96 &sensor_dev_attr_temp1_max_hyst.dev_attr.attr,
97 97  
... ... @@ -100,15 +100,8 @@
100 100 NULL
101 101 };
102 102  
103   -static const struct attribute_group i5500_temp_group = {
104   - .attrs = i5500_temp_attributes,
105   -};
  103 +ATTRIBUTE_GROUPS(i5500_temp);
106 104  
107   -static const struct attribute_group *i5500_temp_groups[] = {
108   - &i5500_temp_group,
109   - NULL
110   -};
111   -
112 105 static const struct pci_device_id i5500_temp_ids[] = {
113 106 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x3438) },
114 107 { 0 },
... ... @@ -133,7 +126,7 @@
133 126 pci_read_config_byte(pdev, REG_TSFSC, &tsfsc);
134 127 pci_read_config_dword(pdev, REG_TSTIMER, &tstimer);
135 128 if (tsfsc == 0x7F && tstimer == 0x07D30D40) {
136   - dev_warn(&pdev->dev, "Sensor seems to be disabled\n");
  129 + dev_notice(&pdev->dev, "Sensor seems to be disabled\n");
137 130 return -ENODEV;
138 131 }
139 132