Module: xenomai-3
Branch: next
Commit: 8b9f07d8241db44455db39aa54229760aaf07380
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=8b9f07d8241db44455db39aa54229760aaf07380
Author: Philippe Gerum <r...@xenomai.org>
Date: Sat May 13 18:42:55 2017 +0200
drivers: stop using obsolete DEFINE_PCI_DEVICE_TABLE macro (4.8+)
---
kernel/drivers/analogy/national_instruments/ni_660x.c | 2 +-
kernel/drivers/analogy/national_instruments/ni_670x.c | 2 +-
kernel/drivers/can/sja1000/rtcan_adv_pci.c | 2 +-
kernel/drivers/can/sja1000/rtcan_plx_pci.c | 2 +-
kernel/drivers/net/drivers/e1000e/netdev.c | 2 +-
kernel/drivers/serial/16550A_pci.h | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/kernel/drivers/analogy/national_instruments/ni_660x.c
b/kernel/drivers/analogy/national_instruments/ni_660x.c
index b2737ad..40a4b26 100644
--- a/kernel/drivers/analogy/national_instruments/ni_660x.c
+++ b/kernel/drivers/analogy/national_instruments/ni_660x.c
@@ -457,7 +457,7 @@ static const struct ni_660x_board ni_660x_boards[] = {
#define NI_660X_MAX_NUM_CHIPS 2
#define NI_660X_MAX_NUM_COUNTERS (NI_660X_MAX_NUM_CHIPS * counters_per_chip)
-static DEFINE_PCI_DEVICE_TABLE(ni_660x_pci_table) = {
+static const struct pci_device_id ni_660x_pci_table[] = {
{
PCI_VENDOR_ID_NATINST, 0x2c60, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
PCI_VENDOR_ID_NATINST, 0x1310, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
diff --git a/kernel/drivers/analogy/national_instruments/ni_670x.c
b/kernel/drivers/analogy/national_instruments/ni_670x.c
index e437ac7..35749be 100644
--- a/kernel/drivers/analogy/national_instruments/ni_670x.c
+++ b/kernel/drivers/analogy/national_instruments/ni_670x.c
@@ -214,7 +214,7 @@ static const struct ni_670x_board ni_670x_boards[] = {
#define n_ni_670x_boards ((sizeof(ni_670x_boards)/sizeof(ni_670x_boards[0])))
-static DEFINE_PCI_DEVICE_TABLE(ni_670x_pci_table) = {
+static const struct pci_device_id ni_670x_pci_table[] = {
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2c90)},
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1920)},
{0}
diff --git a/kernel/drivers/can/sja1000/rtcan_adv_pci.c
b/kernel/drivers/can/sja1000/rtcan_adv_pci.c
index 864ec44..dc8ea2e 100644
--- a/kernel/drivers/can/sja1000/rtcan_adv_pci.c
+++ b/kernel/drivers/can/sja1000/rtcan_adv_pci.c
@@ -84,7 +84,7 @@ struct rtcan_adv_pci {
#define ADV_PCI_DEVICE(device_id)\
{ ADV_PCI_VENDOR_ID, device_id, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }
-static DEFINE_PCI_DEVICE_TABLE(adv_pci_tbl) = {
+static const struct pci_device_id adv_pci_tbl[] = {
ADV_PCI_DEVICE(0x1680),
ADV_PCI_DEVICE(0x3680),
ADV_PCI_DEVICE(0x2052),
diff --git a/kernel/drivers/can/sja1000/rtcan_plx_pci.c
b/kernel/drivers/can/sja1000/rtcan_plx_pci.c
index 614b779..b90a43d 100644
--- a/kernel/drivers/can/sja1000/rtcan_plx_pci.c
+++ b/kernel/drivers/can/sja1000/rtcan_plx_pci.c
@@ -213,7 +213,7 @@ static struct plx_pci_card_info plx_pci_card_info_tews = {
/* based on PLX9030 */
};
-static DEFINE_PCI_DEVICE_TABLE(plx_pci_tbl) = {
+static const struct pci_device_id plx_pci_tbl[] = {
{
/* Adlink PCI-7841/cPCI-7841 */
ADLINK_PCI_VENDOR_ID, ADLINK_PCI_DEVICE_ID,
diff --git a/kernel/drivers/net/drivers/e1000e/netdev.c
b/kernel/drivers/net/drivers/e1000e/netdev.c
index 219b978..923fca9 100644
--- a/kernel/drivers/net/drivers/e1000e/netdev.c
+++ b/kernel/drivers/net/drivers/e1000e/netdev.c
@@ -4274,7 +4274,7 @@ static struct pci_error_handlers e1000_err_handler = {
.resume = e1000_io_resume,
};
-static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = {
+static const struct pci_device_id e1000_pci_tbl[] = {
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_COPPER), board_82571 },
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_FIBER), board_82571 },
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82571EB_QUAD_COPPER), board_82571 },
diff --git a/kernel/drivers/serial/16550A_pci.h
b/kernel/drivers/serial/16550A_pci.h
index 5c12023..91b0390 100644
--- a/kernel/drivers/serial/16550A_pci.h
+++ b/kernel/drivers/serial/16550A_pci.h
@@ -178,7 +178,7 @@ static const struct rt_16550_pci_board rt_16550_moxa_cp168u
= {
};
#endif
-DEFINE_PCI_DEVICE_TABLE( rt_16550_pci_table ) = {
+const struct pci_device_id rt_16550_pci_table[] = {
#if defined(CONFIG_XENO_DRIVERS_16550A_PCI_MOXA)
{PCI_VDEVICE(MOXA, PCI_DEVICE_ID_MOXA_C104),
.driver_data = (unsigned long)&rt_16550_moxa_c104},
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
https://xenomai.org/mailman/listinfo/xenomai-git
