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

Commit 4b0199bc authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "staging: rtl8192e: Replace macro RTL_PCI_DEVICE with PCI_DEVICE" 



This reverts commit 8a65476d which is
commit fda2093860df4812d69052a8cf4997e53853a340 upstream.

Ben reports that this should not have been backported to the older
kernels as the rest of the macro is not empty.  It was a clean-up patch
in 6.4-rc1 only, it did not add new device ids.

Reported-by: default avatarBen Hutchings <ben@decadent.org.uk>
Cc: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Cc: Sasha Levin <sashal@kernel.org>
Link: https://lore.kernel.org/r/aa0d401a7f63448cd4c2fe4a2d7e8495d9aa123e.camel@decadent.org.uk


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 85258ae3

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+3 −3
Original line number Diff line number Diff line
@@ -50,9 +50,9 @@ static const struct rtl819x_ops rtl819xp_ops = { 
};



static struct pci_device_id rtl8192_pci_id_tbl[] = {

	{PCI_DEVICE(0x10ec, 0x8192)},

	{PCI_DEVICE(0x07aa, 0x0044)},

	{PCI_DEVICE(0x07aa, 0x0047)},

	{RTL_PCI_DEVICE(0x10ec, 0x8192, rtl819xp_ops)},

	{RTL_PCI_DEVICE(0x07aa, 0x0044, rtl819xp_ops)},

	{RTL_PCI_DEVICE(0x07aa, 0x0047, rtl819xp_ops)},

	{}

};

drivers/staging/rtl8192e/rtl8192e/rtl_core.h

+5 −0
Original line number Diff line number Diff line
@@ -55,6 +55,11 @@ 
#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