Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <jg1.han@samsung.com>
Acked-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

authored by

Jingoo Han and committed by
Guenter Roeck
cd9bb056 3f9aec76

+6 -6
+1 -1
drivers/hwmon/fam15h_power.c
··· 249 249 sysfs_remove_group(&dev->kobj, &fam15h_power_attr_group); 250 250 } 251 251 252 - static DEFINE_PCI_DEVICE_TABLE(fam15h_power_id_table) = { 252 + static const struct pci_device_id fam15h_power_id_table[] = { 253 253 { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) }, 254 254 { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F4) }, 255 255 {}
+1 -1
drivers/hwmon/k10temp.c
··· 204 204 &sensor_dev_attr_temp1_crit_hyst.dev_attr); 205 205 } 206 206 207 - static DEFINE_PCI_DEVICE_TABLE(k10temp_id_table) = { 207 + static const struct pci_device_id k10temp_id_table[] = { 208 208 { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC) }, 209 209 { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_11H_NB_MISC) }, 210 210 { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },
+1 -1
drivers/hwmon/k8temp.c
··· 135 135 static SENSOR_DEVICE_ATTR_2(temp4_input, S_IRUGO, show_temp, NULL, 1, 1); 136 136 static DEVICE_ATTR(name, S_IRUGO, show_name, NULL); 137 137 138 - static DEFINE_PCI_DEVICE_TABLE(k8temp_ids) = { 138 + static const struct pci_device_id k8temp_ids[] = { 139 139 { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) }, 140 140 { 0 }, 141 141 };
+1 -1
drivers/hwmon/sis5595.c
··· 754 754 return data; 755 755 } 756 756 757 - static DEFINE_PCI_DEVICE_TABLE(sis5595_pci_ids) = { 757 + static const struct pci_device_id sis5595_pci_ids[] = { 758 758 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, 759 759 { 0, } 760 760 };
+1 -1
drivers/hwmon/via686a.c
··· 824 824 return data; 825 825 } 826 826 827 - static DEFINE_PCI_DEVICE_TABLE(via686a_pci_ids) = { 827 + static const struct pci_device_id via686a_pci_ids[] = { 828 828 { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4) }, 829 829 { } 830 830 };
+1 -1
drivers/hwmon/vt8231.c
··· 766 766 .remove = vt8231_remove, 767 767 }; 768 768 769 - static DEFINE_PCI_DEVICE_TABLE(vt8231_pci_ids) = { 769 + static const struct pci_device_id vt8231_pci_ids[] = { 770 770 { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8231_4) }, 771 771 { 0, } 772 772 };