tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
net: stmmac: Get rid of custom STMMAC_DEVICE() macro
Since PCI core provides a generic PCI_DEVICE_DATA() macro,
replace STMMAC_DEVICE() with former one.
No functional change intended.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
authored by
Andy Shevchenko
and committed by
David S. Miller
3e07df43
b5d30812
+14
-19
+14
-19
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+14
-19
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
···
579
579
static SIMPLE_DEV_PM_OPS(stmmac_pm_ops, stmmac_pci_suspend, stmmac_pci_resume);
580
580
581
581
/* synthetic ID, no official vendor */
582
-
#define PCI_VENDOR_ID_STMMAC 0x700
582
+
#define PCI_VENDOR_ID_STMMAC 0x0700
583
583
584
-
#define STMMAC_QUARK_ID 0x0937
585
-
#define STMMAC_DEVICE_ID 0x1108
586
-
#define STMMAC_EHL_RGMII1G_ID 0x4b30
587
-
#define STMMAC_EHL_SGMII1G_ID 0x4b31
588
-
#define STMMAC_TGL_SGMII1G_ID 0xa0ac
589
-
#define STMMAC_GMAC5_ID 0x7102
590
-
591
-
#define STMMAC_DEVICE(vendor_id, dev_id, info) { \
592
-
PCI_VDEVICE(vendor_id, dev_id), \
593
-
.driver_data = (kernel_ulong_t)&info \
594
-
}
584
+
#define PCI_DEVICE_ID_STMMAC_STMMAC 0x1108
585
+
#define PCI_DEVICE_ID_INTEL_QUARK_ID 0x0937
586
+
#define PCI_DEVICE_ID_INTEL_EHL_RGMII1G_ID 0x4b30
587
+
#define PCI_DEVICE_ID_INTEL_EHL_SGMII1G_ID 0x4b31
588
+
#define PCI_DEVICE_ID_INTEL_TGL_SGMII1G_ID 0xa0ac
589
+
#define PCI_DEVICE_ID_SYNOPSYS_GMAC5_ID 0x7102
595
590
596
591
static const struct pci_device_id stmmac_id_table[] = {
597
-
STMMAC_DEVICE(STMMAC, STMMAC_DEVICE_ID, stmmac_pci_info),
598
-
STMMAC_DEVICE(STMICRO, PCI_DEVICE_ID_STMICRO_MAC, stmmac_pci_info),
599
-
STMMAC_DEVICE(INTEL, STMMAC_QUARK_ID, quark_pci_info),
600
-
STMMAC_DEVICE(INTEL, STMMAC_EHL_RGMII1G_ID, ehl_rgmii1g_pci_info),
601
-
STMMAC_DEVICE(INTEL, STMMAC_EHL_SGMII1G_ID, ehl_sgmii1g_pci_info),
602
-
STMMAC_DEVICE(INTEL, STMMAC_TGL_SGMII1G_ID, tgl_sgmii1g_pci_info),
603
-
STMMAC_DEVICE(SYNOPSYS, STMMAC_GMAC5_ID, snps_gmac5_pci_info),
592
+
{ PCI_DEVICE_DATA(STMMAC, STMMAC, &stmmac_pci_info) },
593
+
{ PCI_DEVICE_DATA(STMICRO, MAC, &stmmac_pci_info) },
594
+
{ PCI_DEVICE_DATA(INTEL, QUARK_ID, &quark_pci_info) },
595
+
{ PCI_DEVICE_DATA(INTEL, EHL_RGMII1G_ID, &ehl_rgmii1g_pci_info) },
596
+
{ PCI_DEVICE_DATA(INTEL, EHL_SGMII1G_ID, &ehl_sgmii1g_pci_info) },
597
+
{ PCI_DEVICE_DATA(INTEL, TGL_SGMII1G_ID, &tgl_sgmii1g_pci_info) },
598
+
{ PCI_DEVICE_DATA(SYNOPSYS, GMAC5_ID, &snps_gmac5_pci_info) },
604
599
{}
605
600
};
606
601