Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a80f4c7d authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

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: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/8b45ee783fa91196b7c9d6fc840a189496afd2f4.1677133271.git.philipp.g.hortmann@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6a277623

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+3 −3
Original line number Diff line number Diff line
@@ -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)},

	{}

};

drivers/staging/rtl8192e/rtl8192e/rtl_core.h

+0 −5
Original line number Diff line number Diff line
@@ -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