Skip to content

Commit cd9bb05

Browse files
Jingoo Hangroeck
authored andcommitted
hwmon: remove DEFINE_PCI_DEVICE_TABLE macro
Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro is not preferred. Signed-off-by: Jingoo Han <[email protected]> Acked-by: Jean Delvare <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
1 parent 3f9aec7 commit cd9bb05

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

drivers/hwmon/fam15h_power.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ static void fam15h_power_remove(struct pci_dev *pdev)
249249
sysfs_remove_group(&dev->kobj, &fam15h_power_attr_group);
250250
}
251251

252-
static DEFINE_PCI_DEVICE_TABLE(fam15h_power_id_table) = {
252+
static const struct pci_device_id fam15h_power_id_table[] = {
253253
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },
254254
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F4) },
255255
{}

drivers/hwmon/k10temp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ static void k10temp_remove(struct pci_dev *pdev)
204204
&sensor_dev_attr_temp1_crit_hyst.dev_attr);
205205
}
206206

207-
static DEFINE_PCI_DEVICE_TABLE(k10temp_id_table) = {
207+
static const struct pci_device_id k10temp_id_table[] = {
208208
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC) },
209209
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_11H_NB_MISC) },
210210
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },

drivers/hwmon/k8temp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ static SENSOR_DEVICE_ATTR_2(temp3_input, S_IRUGO, show_temp, NULL, 1, 0);
135135
static SENSOR_DEVICE_ATTR_2(temp4_input, S_IRUGO, show_temp, NULL, 1, 1);
136136
static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
137137

138-
static DEFINE_PCI_DEVICE_TABLE(k8temp_ids) = {
138+
static const struct pci_device_id k8temp_ids[] = {
139139
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) },
140140
{ 0 },
141141
};

drivers/hwmon/sis5595.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ static struct sis5595_data *sis5595_update_device(struct device *dev)
754754
return data;
755755
}
756756

757-
static DEFINE_PCI_DEVICE_TABLE(sis5595_pci_ids) = {
757+
static const struct pci_device_id sis5595_pci_ids[] = {
758758
{ PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },
759759
{ 0, }
760760
};

drivers/hwmon/via686a.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@ static struct via686a_data *via686a_update_device(struct device *dev)
824824
return data;
825825
}
826826

827-
static DEFINE_PCI_DEVICE_TABLE(via686a_pci_ids) = {
827+
static const struct pci_device_id via686a_pci_ids[] = {
828828
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4) },
829829
{ }
830830
};

drivers/hwmon/vt8231.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -766,7 +766,7 @@ static struct platform_driver vt8231_driver = {
766766
.remove = vt8231_remove,
767767
};
768768

769-
static DEFINE_PCI_DEVICE_TABLE(vt8231_pci_ids) = {
769+
static const struct pci_device_id vt8231_pci_ids[] = {
770770
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8231_4) },
771771
{ 0, }
772772
};

0 commit comments

Comments
 (0)