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

i2c: Convert to DEFINE_PCI_DEVICE_TABLE

Convert static struct pci_device_id *[] to static DEFINE_PCI_DEVICE_TABLE
tables.

Use DEFINE_PCI_DEVICE_TABLE ensures we make the pci_device_id table const
and marked as __devinitconst.

This also fixes some warnings from checkpatch:
e.g.
WARNING: Use DEFINE_PCI_DEVICE_TABLE for struct pci_device_id
#1096: FILE: i2c/busses/i2c-intel-mid.c:1096:
+static struct pci_device_id intel_mid_i2c_ids[] = {

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Cc: Rudolf Marek <r.marek@assembler.cz>
Cc: Ben Dooks <ben-linux@fluff.org>
Acked-by: Olof Johansson <olof@lixom.net>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Acked-by: Dirk Brandewie <dirk.brandewie@gmail.com>
Cc: Tomoya MORINAGA <tomoya-linux@dsn.lapis-semi.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: Feng Tang <feng.tang@intel.com>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

authored by

Axel Lin and committed by
Jean Delvare
3527bd50 65a2d74b

+19 -19
+1 -1
drivers/i2c/busses/i2c-ali1563.c
··· 417 417 ali1563_shutdown(dev); 418 418 } 419 419 420 - static const struct pci_device_id ali1563_id_table[] __devinitconst = { 420 + static DEFINE_PCI_DEVICE_TABLE(ali1563_id_table) = { 421 421 { PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1563) }, 422 422 {}, 423 423 };
+1 -1
drivers/i2c/busses/i2c-ali15x3.c
··· 477 477 .algo = &smbus_algorithm, 478 478 }; 479 479 480 - static const struct pci_device_id ali15x3_ids[] = { 480 + static DEFINE_PCI_DEVICE_TABLE(ali15x3_ids) = { 481 481 { PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101) }, 482 482 { 0, } 483 483 };
+1 -1
drivers/i2c/busses/i2c-amd756.c
··· 308 308 "nVidia nForce", "AMD8111", 309 309 }; 310 310 311 - static const struct pci_device_id amd756_ids[] = { 311 + static DEFINE_PCI_DEVICE_TABLE(amd756_ids) = { 312 312 { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_740B), 313 313 .driver_data = AMD756 }, 314 314 { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_7413),
+1 -1
drivers/i2c/busses/i2c-amd8111.c
··· 415 415 }; 416 416 417 417 418 - static const struct pci_device_id amd8111_ids[] = { 418 + static DEFINE_PCI_DEVICE_TABLE(amd8111_ids) = { 419 419 { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_SMBUS2) }, 420 420 { 0, } 421 421 };
+1 -1
drivers/i2c/busses/i2c-designware-pcidrv.c
··· 349 349 /* work with hotplug and coldplug */ 350 350 MODULE_ALIAS("i2c_designware-pci"); 351 351 352 - DEFINE_PCI_DEVICE_TABLE(i2_designware_pci_ids) = { 352 + static DEFINE_PCI_DEVICE_TABLE(i2_designware_pci_ids) = { 353 353 /* Moorestown */ 354 354 { PCI_VDEVICE(INTEL, 0x0802), moorestown_0 }, 355 355 { PCI_VDEVICE(INTEL, 0x0803), moorestown_1 },
+1 -1
drivers/i2c/busses/i2c-eg20t.c
··· 185 185 #define PCI_DEVICE_ID_ML7213_I2C 0x802D 186 186 #define PCI_DEVICE_ID_ML7223_I2C 0x8010 187 187 188 - static struct pci_device_id __devinitdata pch_pcidev_id[] = { 188 + static DEFINE_PCI_DEVICE_TABLE(pch_pcidev_id) = { 189 189 { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PCH_I2C), 1, }, 190 190 { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_I2C), 2, }, 191 191 { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_I2C), 1, },
+1 -1
drivers/i2c/busses/i2c-hydra.c
··· 105 105 .algo_data = &hydra_bit_data, 106 106 }; 107 107 108 - static const struct pci_device_id hydra_ids[] = { 108 + static DEFINE_PCI_DEVICE_TABLE(hydra_ids) = { 109 109 { PCI_DEVICE(PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_HYDRA) }, 110 110 { 0, } 111 111 };
+1 -1
drivers/i2c/busses/i2c-i801.c
··· 609 609 .functionality = i801_func, 610 610 }; 611 611 612 - static const struct pci_device_id i801_ids[] = { 612 + static DEFINE_PCI_DEVICE_TABLE(i801_ids) = { 613 613 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AA_3) }, 614 614 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AB_3) }, 615 615 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_2) },
+1 -1
drivers/i2c/busses/i2c-intel-mid.c
··· 1093 1093 pci_release_region(dev, 0); 1094 1094 } 1095 1095 1096 - static struct pci_device_id intel_mid_i2c_ids[] = { 1096 + static DEFINE_PCI_DEVICE_TABLE(intel_mid_i2c_ids) = { 1097 1097 /* Moorestown */ 1098 1098 { PCI_VDEVICE(INTEL, 0x0802), 0 }, 1099 1099 { PCI_VDEVICE(INTEL, 0x0803), 1 },
+1 -1
drivers/i2c/busses/i2c-nforce2.c
··· 309 309 }; 310 310 311 311 312 - static const struct pci_device_id nforce2_ids[] = { 312 + static DEFINE_PCI_DEVICE_TABLE(nforce2_ids) = { 313 313 { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2_SMBUS) }, 314 314 { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2S_SMBUS) }, 315 315 { 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 const struct pci_device_id pasemi_smb_ids[] = { 404 + static DEFINE_PCI_DEVICE_TABLE(pasemi_smb_ids) = { 405 405 { PCI_DEVICE(0x1959, 0xa003) }, 406 406 { 0, } 407 407 };
+1 -1
drivers/i2c/busses/i2c-piix4.c
··· 472 472 .algo = &smbus_algorithm, 473 473 }; 474 474 475 - static const struct pci_device_id piix4_ids[] = { 475 + static DEFINE_PCI_DEVICE_TABLE(piix4_ids) = { 476 476 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3) }, 477 477 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443MX_3) }, 478 478 { PCI_DEVICE(PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_3) },
+1 -1
drivers/i2c/busses/i2c-pxa-pci.c
··· 150 150 kfree(sds); 151 151 } 152 152 153 - static struct pci_device_id ce4100_i2c_devices[] __devinitdata = { 153 + static DEFINE_PCI_DEVICE_TABLE(ce4100_i2c_devices) = { 154 154 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x2e68)}, 155 155 { }, 156 156 };
+1 -1
drivers/i2c/busses/i2c-sis5595.c
··· 369 369 .algo = &smbus_algorithm, 370 370 }; 371 371 372 - static const struct pci_device_id sis5595_ids[] __devinitconst = { 372 + static DEFINE_PCI_DEVICE_TABLE(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
··· 472 472 .algo = &smbus_algorithm, 473 473 }; 474 474 475 - static const struct pci_device_id sis630_ids[] __devinitconst = { 475 + static DEFINE_PCI_DEVICE_TABLE(sis630_ids) = { 476 476 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, 477 477 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_LPC) }, 478 478 { 0, }
+1 -1
drivers/i2c/busses/i2c-sis96x.c
··· 245 245 .algo = &smbus_algorithm, 246 246 }; 247 247 248 - static const struct pci_device_id sis96x_ids[] = { 248 + static DEFINE_PCI_DEVICE_TABLE(sis96x_ids) = { 249 249 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_SMBUS) }, 250 250 { 0, } 251 251 };
+1 -1
drivers/i2c/busses/i2c-via.c
··· 89 89 }; 90 90 91 91 92 - static const struct pci_device_id vt586b_ids[] __devinitconst = { 92 + static DEFINE_PCI_DEVICE_TABLE(vt586b_ids) = { 93 93 { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_3) }, 94 94 { 0, } 95 95 };
+1 -1
drivers/i2c/busses/i2c-viapro.c
··· 441 441 return error; 442 442 } 443 443 444 - static const struct pci_device_id vt596_ids[] = { 444 + static DEFINE_PCI_DEVICE_TABLE(vt596_ids) = { 445 445 { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C596_3), 446 446 .driver_data = SMBBA1 }, 447 447 { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C596B_3),
+1 -1
drivers/i2c/busses/scx200_acb.c
··· 559 559 .remove = __devexit_p(scx200_remove), 560 560 }; 561 561 562 - static const struct pci_device_id scx200_isa[] __initconst = { 562 + static DEFINE_PCI_DEVICE_TABLE(scx200_isa) = { 563 563 { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_BRIDGE) }, 564 564 { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE) }, 565 565 { 0, }