tty: remove DEFINE_PCI_DEVICE_TABLE macro

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

kernel os linux

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Jingoo Han and committed by

Greg Kroah-Hartman 12 years ago 311df74a 6b471a98

+3 -3

3 changed files

expand all

drivers

tty

rocket.c

serial

pch_uart.c

rp2.c

+1 -1

drivers/tty/rocket.c

··· 1744 1744 1745 1745 #ifdef CONFIG_PCI 1746 1746 1747 - static DEFINE_PCI_DEVICE_TABLE(rocket_pci_ids) = { 1747 + static const struct pci_device_id rocket_pci_ids[] = { 1748 1748 { PCI_DEVICE(PCI_VENDOR_ID_RP, PCI_DEVICE_ID_RP4QUAD) }, 1749 1749 { PCI_DEVICE(PCI_VENDOR_ID_RP, PCI_DEVICE_ID_RP8OCTA) }, 1750 1750 { PCI_DEVICE(PCI_VENDOR_ID_RP, PCI_DEVICE_ID_URP8OCTA) },

+1 -1

drivers/tty/serial/pch_uart.c

··· 1906 1906 #define pch_uart_pci_resume NULL 1907 1907 #endif 1908 1908 1909 - static DEFINE_PCI_DEVICE_TABLE(pch_uart_pci_id) = { 1909 + static const struct pci_device_id pch_uart_pci_id[] = { 1910 1910 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8811), 1911 1911 .driver_data = pch_et20t_uart0}, 1912 1912 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8812),

+1 -1

drivers/tty/serial/rp2.c

··· 810 810 rp2_remove_ports(card); 811 811 } 812 812 813 - static DEFINE_PCI_DEVICE_TABLE(rp2_pci_tbl) = { 813 + static const struct pci_device_id rp2_pci_tbl[] = { 814 814 815 815 /* RocketPort INFINITY cards */ 816 816