ethernet: realtek: use pci_device_id
This patch use the struct pci_device_id instead of using macro DEFINE_PCI_DEVICE_TABLE which is deprecated and should not be used. And also moves these ids after probe and remove functionalities. Signed-off-by: Varka Bhadram <varkab@cdac.in> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
5490c27218
Коммит
96b3bff4c9
|
@ -382,13 +382,6 @@ static int cp_get_eeprom(struct net_device *dev,
|
|||
static int cp_set_eeprom(struct net_device *dev,
|
||||
struct ethtool_eeprom *eeprom, u8 *data);
|
||||
|
||||
static DEFINE_PCI_DEVICE_TABLE(cp_pci_tbl) = {
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_8139), },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_TTTECH, PCI_DEVICE_ID_TTTECH_MC322), },
|
||||
{ },
|
||||
};
|
||||
MODULE_DEVICE_TABLE(pci, cp_pci_tbl);
|
||||
|
||||
static struct {
|
||||
const char str[ETH_GSTRING_LEN];
|
||||
} ethtool_stats_keys[] = {
|
||||
|
@ -2106,6 +2099,13 @@ static int cp_resume (struct pci_dev *pdev)
|
|||
}
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
static const struct pci_device_id cp_pci_tbl[] = {
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_8139), },
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_TTTECH, PCI_DEVICE_ID_TTTECH_MC322), },
|
||||
{ },
|
||||
};
|
||||
MODULE_DEVICE_TABLE(pci, cp_pci_tbl);
|
||||
|
||||
static struct pci_driver cp_driver = {
|
||||
.name = DRV_NAME,
|
||||
.id_table = cp_pci_tbl,
|
||||
|
|
Загрузка…
Ссылка в новой задаче