On Mon, 2023-05-22 at 20:07 +0100, Greg Kroah-Hartman wrote: > From: Philipp Hortmann <philipp.g.hortmann@xxxxxxxxx> > > [ Upstream commit fda2093860df4812d69052a8cf4997e53853a340 ] > > Replace macro RTL_PCI_DEVICE with PCI_DEVICE to get rid of rtl819xp_ops > which is empty. It is not empty (except in 6.4). This needs to be reverted from all stable branches. Ben. > Signed-off-by: Philipp Hortmann <philipp.g.hortmann@xxxxxxxxx> > Link: https://lore.kernel.org/r/8b45ee783fa91196b7c9d6fc840a189496afd2f4.1677133271.git.philipp.g.hortmann@xxxxxxxxx > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> > --- > drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 6 +++--- > drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 5 ----- > 2 files changed, 3 insertions(+), 8 deletions(-) > > diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c > index 72d76dc7df781..92552ce30cd58 100644 > --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c > +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c > @@ -48,9 +48,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 fd96eef90c7fa..bbc1c4bac3588 100644 > --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h > +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h > @@ -55,11 +55,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 > -- Ben Hutchings When in doubt, use brute force. - Ken Thompson
Attachment:
signature.asc
Description: This is a digitally signed message part
