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

i2c: 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>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

authored by

Jingoo Han and committed by
Wolfram Sang
392debf1 069a9502

+20 -20
+1 -1
drivers/i2c/busses/i2c-ali1535.c
··· 494 494 .algo = &smbus_algorithm, 495 495 }; 496 496 497 - static DEFINE_PCI_DEVICE_TABLE(ali1535_ids) = { 497 + static const struct pci_device_id ali1535_ids[] = { 498 498 { PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101) }, 499 499 { }, 500 500 };
+1 -1
drivers/i2c/busses/i2c-ali1563.c
··· 416 416 ali1563_shutdown(dev); 417 417 } 418 418 419 - static DEFINE_PCI_DEVICE_TABLE(ali1563_id_table) = { 419 + static const struct pci_device_id ali1563_id_table[] = { 420 420 { PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1563) }, 421 421 {}, 422 422 };
+1 -1
drivers/i2c/busses/i2c-ali15x3.c
··· 476 476 .algo = &smbus_algorithm, 477 477 }; 478 478 479 - static DEFINE_PCI_DEVICE_TABLE(ali15x3_ids) = { 479 + static const struct pci_device_id ali15x3_ids[] = { 480 480 { PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101) }, 481 481 { 0, } 482 482 };
+1 -1
drivers/i2c/busses/i2c-amd756.c
··· 307 307 "nVidia nForce", "AMD8111", 308 308 }; 309 309 310 - static DEFINE_PCI_DEVICE_TABLE(amd756_ids) = { 310 + static const struct pci_device_id amd756_ids[] = { 311 311 { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_740B), 312 312 .driver_data = AMD756 }, 313 313 { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_7413),
+1 -1
drivers/i2c/busses/i2c-amd8111.c
··· 414 414 }; 415 415 416 416 417 - static DEFINE_PCI_DEVICE_TABLE(amd8111_ids) = { 417 + static const struct pci_device_id amd8111_ids[] = { 418 418 { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_SMBUS2) }, 419 419 { 0, } 420 420 };
+1 -1
drivers/i2c/busses/i2c-designware-pcidrv.c
··· 308 308 /* work with hotplug and coldplug */ 309 309 MODULE_ALIAS("i2c_designware-pci"); 310 310 311 - static DEFINE_PCI_DEVICE_TABLE(i2_designware_pci_ids) = { 311 + static const struct pci_device_id i2_designware_pci_ids[] = { 312 312 /* Moorestown */ 313 313 { PCI_VDEVICE(INTEL, 0x0802), moorestown_0 }, 314 314 { PCI_VDEVICE(INTEL, 0x0803), moorestown_1 },
+1 -1
drivers/i2c/busses/i2c-eg20t.c
··· 186 186 #define PCI_DEVICE_ID_ML7223_I2C 0x8010 187 187 #define PCI_DEVICE_ID_ML7831_I2C 0x8817 188 188 189 - static DEFINE_PCI_DEVICE_TABLE(pch_pcidev_id) = { 189 + static const struct pci_device_id pch_pcidev_id[] = { 190 190 { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PCH_I2C), 1, }, 191 191 { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_I2C), 2, }, 192 192 { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_I2C), 1, },
+1 -1
drivers/i2c/busses/i2c-hydra.c
··· 104 104 .algo_data = &hydra_bit_data, 105 105 }; 106 106 107 - static DEFINE_PCI_DEVICE_TABLE(hydra_ids) = { 107 + static const struct pci_device_id hydra_ids[] = { 108 108 { PCI_DEVICE(PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_HYDRA) }, 109 109 { 0, } 110 110 };
+1 -1
drivers/i2c/busses/i2c-i801.c
··· 791 791 .functionality = i801_func, 792 792 }; 793 793 794 - static DEFINE_PCI_DEVICE_TABLE(i801_ids) = { 794 + static const struct pci_device_id i801_ids[] = { 795 795 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AA_3) }, 796 796 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AB_3) }, 797 797 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_2) },
+1 -1
drivers/i2c/busses/i2c-ismt.c
··· 182 182 /** 183 183 * ismt_ids - PCI device IDs supported by this driver 184 184 */ 185 - static DEFINE_PCI_DEVICE_TABLE(ismt_ids) = { 185 + static const struct pci_device_id ismt_ids[] = { 186 186 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_S1200_SMT0) }, 187 187 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_S1200_SMT1) }, 188 188 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_AVOTON_SMT) },
+1 -1
drivers/i2c/busses/i2c-nforce2.c
··· 306 306 }; 307 307 308 308 309 - static DEFINE_PCI_DEVICE_TABLE(nforce2_ids) = { 309 + static const struct pci_device_id nforce2_ids[] = { 310 310 { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2_SMBUS) }, 311 311 { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2S_SMBUS) }, 312 312 { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3_SMBUS) },
+1 -1
drivers/i2c/busses/i2c-pasemi.c
··· 401 401 kfree(smbus); 402 402 } 403 403 404 - static DEFINE_PCI_DEVICE_TABLE(pasemi_smb_ids) = { 404 + static const struct pci_device_id pasemi_smb_ids[] = { 405 405 { PCI_DEVICE(0x1959, 0xa003) }, 406 406 { 0, } 407 407 };
+1 -1
drivers/i2c/busses/i2c-piix4.c
··· 540 540 .functionality = piix4_func, 541 541 }; 542 542 543 - static DEFINE_PCI_DEVICE_TABLE(piix4_ids) = { 543 + static const struct pci_device_id piix4_ids[] = { 544 544 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3) }, 545 545 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443MX_3) }, 546 546 { PCI_DEVICE(PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_3) },
+1 -1
drivers/i2c/busses/i2c-pxa-pci.c
··· 148 148 kfree(sds); 149 149 } 150 150 151 - static DEFINE_PCI_DEVICE_TABLE(ce4100_i2c_devices) = { 151 + static const struct pci_device_id ce4100_i2c_devices[] = { 152 152 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x2e68)}, 153 153 { }, 154 154 };
+1 -1
drivers/i2c/busses/i2c-sis5595.c
··· 369 369 .algo = &smbus_algorithm, 370 370 }; 371 371 372 - static DEFINE_PCI_DEVICE_TABLE(sis5595_ids) = { 372 + static const struct pci_device_id sis5595_ids[] = { 373 373 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, 374 374 { 0, } 375 375 };
+1 -1
drivers/i2c/busses/i2c-sis630.c
··· 510 510 .retries = 3 511 511 }; 512 512 513 - static DEFINE_PCI_DEVICE_TABLE(sis630_ids) = { 513 + static const struct pci_device_id sis630_ids[] = { 514 514 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, 515 515 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_LPC) }, 516 516 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_964) },
+1 -1
drivers/i2c/busses/i2c-sis96x.c
··· 244 244 .algo = &smbus_algorithm, 245 245 }; 246 246 247 - static DEFINE_PCI_DEVICE_TABLE(sis96x_ids) = { 247 + static const struct pci_device_id sis96x_ids[] = { 248 248 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_SMBUS) }, 249 249 { 0, } 250 250 };
+1 -1
drivers/i2c/busses/i2c-via.c
··· 88 88 }; 89 89 90 90 91 - static DEFINE_PCI_DEVICE_TABLE(vt586b_ids) = { 91 + static const struct pci_device_id vt586b_ids[] = { 92 92 { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_3) }, 93 93 { 0, } 94 94 };
+1 -1
drivers/i2c/busses/i2c-viapro.c
··· 442 442 return error; 443 443 } 444 444 445 - static DEFINE_PCI_DEVICE_TABLE(vt596_ids) = { 445 + static const struct pci_device_id vt596_ids[] = { 446 446 { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C596_3), 447 447 .driver_data = SMBBA1 }, 448 448 { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C596B_3),
+1 -1
drivers/i2c/busses/scx200_acb.c
··· 556 556 .remove = scx200_remove, 557 557 }; 558 558 559 - static DEFINE_PCI_DEVICE_TABLE(scx200_isa) = { 559 + static const struct pci_device_id scx200_isa[] = { 560 560 { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_BRIDGE) }, 561 561 { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE) }, 562 562 { 0, }