diff --git a/patches.suse/staging-rtl8192e-Replace-macro-RTL_PCI_DEVICE-with-P.patch b/patches.suse/staging-rtl8192e-Replace-macro-RTL_PCI_DEVICE-with-P.patch new file mode 100644 index 0000000..6279473 --- /dev/null +++ b/patches.suse/staging-rtl8192e-Replace-macro-RTL_PCI_DEVICE-with-P.patch @@ -0,0 +1,57 @@ +From fda2093860df4812d69052a8cf4997e53853a340 Mon Sep 17 00:00:00 2001 +From: Philipp Hortmann +Date: Thu, 23 Feb 2023 07:47:21 +0100 +Subject: [PATCH] staging: rtl8192e: Replace macro RTL_PCI_DEVICE with PCI_DEVICE +Git-commit: fda2093860df4812d69052a8cf4997e53853a340 +Patch-mainline: v6.4-rc1 +References: git-fixes + +Replace macro RTL_PCI_DEVICE with PCI_DEVICE to get rid of rtl819xp_ops +which is empty. + +Signed-off-by: Philipp Hortmann +Link: https://lore.kernel.org/r/8b45ee783fa91196b7c9d6fc840a189496afd2f4.1677133271.git.philipp.g.hortmann@gmail.com +Signed-off-by: Greg Kroah-Hartman +Acked-by: Takashi Iwai + +--- + 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 044cab649ff1..f5a155d1a81a 100644 +--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c ++++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +@@ -29,9 +29,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 f75cc96052d9..c2a4b2ae6a81 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 + +-- +2.35.3 + diff --git a/series.conf b/series.conf index 6717e8f..58e4d61 100644 --- a/series.conf +++ b/series.conf @@ -19994,6 +19994,7 @@ patches.suse/tty-serial-fsl_lpuart-adjust-buffer-length-to-the-in.patch patches.suse/serial-8250-Add-missing-wakeup-event-reporting.patch patches.suse/serial-8250-Reinit-port-pm-on-port-specific-driver-u.patch + patches.suse/staging-rtl8192e-Replace-macro-RTL_PCI_DEVICE-with-P.patch patches.suse/drivers-staging-rtl8723bs-Fix-locking-in-_rtw_join_t.patch patches.suse/drivers-staging-rtl8723bs-Fix-locking-in-rtw_scan_ti.patch patches.suse/staging-iio-resolver-ads1210-fix-config-mode.patch