staging: rtl8192e: Replace macro RTL_PCI_DEVICE with PCI_DEVICE

[ Upstream commit fda2093860df4812d69052a8cf4997e53853a340 ]

Replace macro RTL_PCI_DEVICE with PCI_DEVICE to get rid of rtl819xp_ops
which is empty.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/8b45ee783fa91196b7c9d6fc840a189496afd2f4.1677133271.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 8420bdae1a5cc8fc3ffb6c7b349755cbc3478d59..8bccaf9ea7009ba521e4aeec63f34b9b231051f2 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -61,9 +61,9 @@ static const struct rtl819x_ops rtl819xp_ops = {
 };
 
 static struct pci_device_id rtl8192_pci_id_tbl[] = {
-       {RTL_PCI_DEVICE(0x10ec, 0x8192, rtl819xp_ops)},
-       {RTL_PCI_DEVICE(0x07aa, 0x0044, rtl819xp_ops)},
-       {RTL_PCI_DEVICE(0x07aa, 0x0047, rtl819xp_ops)},
+       {PCI_DEVICE(0x10ec, 0x8192)},
+       {PCI_DEVICE(0x07aa, 0x0044)},
+       {PCI_DEVICE(0x07aa, 0x0047)},
        {}
 };
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index 9d3089cb6a5af4a9b62fe25dfede78bb6d78ba68..ff9b544edf875803031189ba8d4809107344fcc2 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -67,11 +67,6 @@
 #define IS_HARDWARE_TYPE_8192SE(_priv)         \
        (((struct r8192_priv *)rtllib_priv(dev))->card_8192 == NIC_8192SE)
 
-#define RTL_PCI_DEVICE(vend, dev, cfg) \
-       .vendor = (vend), .device = (dev), \
-       .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, \
-       .driver_data = (kernel_ulong_t)&(cfg)
-
 #define TOTAL_CAM_ENTRY                32
 #define CAM_CONTENT_COUNT      8