diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-12-02 18:26:37 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-08 20:09:07 -0500 |
commit | 311df74ade503af204ac6b8ee55ce30ff2411398 (patch) | |
tree | 3b4a43aa6f39eec16f707458e2e33320284db0d0 | |
parent | 6b471a9840eefc96abb3fbd9eb71e1eb93399daa (diff) |
tty: 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/tty/rocket.c | 2 | ||||
-rw-r--r-- | drivers/tty/serial/pch_uart.c | 2 | ||||
-rw-r--r-- | drivers/tty/serial/rp2.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c index 354564ea47c5..383c4c796637 100644 --- a/drivers/tty/rocket.c +++ b/drivers/tty/rocket.c | |||
@@ -1744,7 +1744,7 @@ static void rp_flush_buffer(struct tty_struct *tty) | |||
1744 | 1744 | ||
1745 | #ifdef CONFIG_PCI | 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 | { PCI_DEVICE(PCI_VENDOR_ID_RP, PCI_DEVICE_ID_RP4QUAD) }, | 1748 | { PCI_DEVICE(PCI_VENDOR_ID_RP, PCI_DEVICE_ID_RP4QUAD) }, |
1749 | { PCI_DEVICE(PCI_VENDOR_ID_RP, PCI_DEVICE_ID_RP8OCTA) }, | 1749 | { PCI_DEVICE(PCI_VENDOR_ID_RP, PCI_DEVICE_ID_RP8OCTA) }, |
1750 | { PCI_DEVICE(PCI_VENDOR_ID_RP, PCI_DEVICE_ID_URP8OCTA) }, | 1750 | { PCI_DEVICE(PCI_VENDOR_ID_RP, PCI_DEVICE_ID_URP8OCTA) }, |
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c index 11c862c6bac8..9cbd3acaf37f 100644 --- a/drivers/tty/serial/pch_uart.c +++ b/drivers/tty/serial/pch_uart.c | |||
@@ -1906,7 +1906,7 @@ static int pch_uart_pci_resume(struct pci_dev *pdev) | |||
1906 | #define pch_uart_pci_resume NULL | 1906 | #define pch_uart_pci_resume NULL |
1907 | #endif | 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 | {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8811), | 1910 | {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8811), |
1911 | .driver_data = pch_et20t_uart0}, | 1911 | .driver_data = pch_et20t_uart0}, |
1912 | {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8812), | 1912 | {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8812), |
diff --git a/drivers/tty/serial/rp2.c b/drivers/tty/serial/rp2.c index 328d6deb6b08..056f91b3a4ca 100644 --- a/drivers/tty/serial/rp2.c +++ b/drivers/tty/serial/rp2.c | |||
@@ -810,7 +810,7 @@ static void rp2_remove(struct pci_dev *pdev) | |||
810 | rp2_remove_ports(card); | 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 | /* RocketPort INFINITY cards */ | 815 | /* RocketPort INFINITY cards */ |
816 | 816 | ||