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

tg3: Use DEFINE_PCI_DEVICE_TABLE

Moves the PCI tables to the right read-only section.

Signed-off-by: Joe Perches <joe@perches.com>

+12 -14
+12 -14
drivers/net/tg3.c
··· 13086 13086 return 512; 13087 13087 } 13088 13088 13089 + DEFINE_PCI_DEVICE_TABLE(write_reorder_chipsets) = { 13090 + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_FE_GATE_700C) }, 13091 + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE) }, 13092 + { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8385_0) }, 13093 + { }, 13094 + }; 13095 + 13089 13096 static int __devinit tg3_get_invariants(struct tg3 *tp) 13090 13097 { 13091 - static struct pci_device_id write_reorder_chipsets[] = { 13092 - { PCI_DEVICE(PCI_VENDOR_ID_AMD, 13093 - PCI_DEVICE_ID_AMD_FE_GATE_700C) }, 13094 - { PCI_DEVICE(PCI_VENDOR_ID_AMD, 13095 - PCI_DEVICE_ID_AMD_8131_BRIDGE) }, 13096 - { PCI_DEVICE(PCI_VENDOR_ID_VIA, 13097 - PCI_DEVICE_ID_VIA_8385_0) }, 13098 - { }, 13099 - }; 13100 13098 u32 misc_ctrl_reg; 13101 13099 u32 pci_state_reg, grc_misc_cfg; 13102 13100 u32 val; ··· 14227 14229 14228 14230 #define TEST_BUFFER_SIZE 0x2000 14229 14231 14232 + DEFINE_PCI_DEVICE_TABLE(dma_wait_state_chipsets) = { 14233 + { PCI_DEVICE(PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_PCI15) }, 14234 + { }, 14235 + }; 14236 + 14230 14237 static int __devinit tg3_test_dma(struct tg3 *tp) 14231 14238 { 14232 14239 dma_addr_t buf_dma; ··· 14401 14398 } 14402 14399 if ((tp->dma_rwctrl & DMA_RWCTRL_WRITE_BNDRY_MASK) != 14403 14400 DMA_RWCTRL_WRITE_BNDRY_16) { 14404 - static struct pci_device_id dma_wait_state_chipsets[] = { 14405 - { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 14406 - PCI_DEVICE_ID_APPLE_UNI_N_PCI15) }, 14407 - { }, 14408 - }; 14409 14401 14410 14402 /* DMA test passed without adjusting DMA boundary, 14411 14403 * now look for chipsets that are known to expose the