misc: rtsx: Cleanup on DRV_NAME cardreader variables

The rtsx_pci_ms memstick driver has been dropped, thus there is no more
need for DRV_NAME_RTSX_PCI_MS variable. Additionally, this also stand-
arizes DRV_NAME variables on alcor_pci and rtsx_usb drivers.

Fixes: d0f459259c13 ("memstick: rtsx_pci_ms: Remove Realtek PCI memstick driver")
Signed-off-by: Desnes Nunes <desnesn@redhat.com>
Link: https://lore.kernel.org/r/20241031142801.1141680-1-desnesn@redhat.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/cardreader/alcor_pci.c b/drivers/misc/cardreader/alcor_pci.c
index 0142c4bf4f42d448613e4993b197ccc60f88c072..a5549eaf52d089c5c572bac1323b2ab650f24665 100644 (file)
--- a/drivers/misc/cardreader/alcor_pci.c
+++ b/drivers/misc/cardreader/alcor_pci.c
@@ -17,8 +17,6 @@
 
 #include <linux/alcor_pci.h>
 
-#define DRV_NAME_ALCOR_PCI                     "alcor_pci"
-
 static DEFINE_IDA(alcor_pci_idr);
 
 static struct mfd_cell alcor_pci_cells[] = {

diff --git a/drivers/misc/cardreader/rtsx_usb.c b/drivers/misc/cardreader/rtsx_usb.c
index f150d8769f1986fdab8d16aea6d7f83c4ae25a75..77b0490a1b38d79134d48020bd49a9fa6f0df967 100644 (file)
--- a/drivers/misc/cardreader/rtsx_usb.c
+++ b/drivers/misc/cardreader/rtsx_usb.c
@@ -20,11 +20,11 @@ MODULE_PARM_DESC(polling_pipe, "polling pipe (0: ctl, 1: bulk)");
 
 static const struct mfd_cell rtsx_usb_cells[] = {
        [RTSX_USB_SD_CARD] = {
-               .name = "rtsx_usb_sdmmc",
+               .name = DRV_NAME_RTSX_USB_SDMMC,
                .pdata_size = 0,
        },
        [RTSX_USB_MS_CARD] = {
-               .name = "rtsx_usb_ms",
+               .name = DRV_NAME_RTSX_USB_MS,
                .pdata_size = 0,
        },
 };
@@ -780,7 +780,7 @@ static const struct usb_device_id rtsx_usb_usb_ids[] = {
 MODULE_DEVICE_TABLE(usb, rtsx_usb_usb_ids);
 
 static struct usb_driver rtsx_usb_driver = {
-       .name                   = "rtsx_usb",
+       .name                   = DRV_NAME_RTSX_USB,
        .probe                  = rtsx_usb_probe,
        .disconnect             = rtsx_usb_disconnect,
        .suspend                = rtsx_usb_suspend,

diff --git a/include/linux/alcor_pci.h b/include/linux/alcor_pci.h
index c4a0b23846d8ddbe8f4bf6cd7b1e7a6546234d09..dcb1d37dabc293a31256ba5efd0338416aa630af 100644 (file)
--- a/include/linux/alcor_pci.h
+++ b/include/linux/alcor_pci.h
@@ -11,6 +11,7 @@
 #define ALCOR_SD_CARD 0
 #define ALCOR_MS_CARD 1
 
+#define DRV_NAME_ALCOR_PCI                     "alcor_pci"
 #define DRV_NAME_ALCOR_PCI_SDMMC               "alcor_sdmmc"
 #define DRV_NAME_ALCOR_PCI_MS                  "alcor_ms"
 

diff --git a/include/linux/rtsx_common.h b/include/linux/rtsx_common.h
index bf290ad14c57f038df6dac520191359547c0603c..da9c8c6b5d50f04bc08f7af7c48e90e15e96d0b4 100644 (file)
--- a/include/linux/rtsx_common.h
+++ b/include/linux/rtsx_common.h
@@ -12,7 +12,6 @@
 
 #define DRV_NAME_RTSX_PCI              "rtsx_pci"
 #define DRV_NAME_RTSX_PCI_SDMMC                "rtsx_pci_sdmmc"
-#define DRV_NAME_RTSX_PCI_MS           "rtsx_pci_ms"
 
 #define RTSX_REG_PAIR(addr, val)       (((u32)(addr) << 16) | (u8)(val))
 

diff --git a/include/linux/rtsx_usb.h b/include/linux/rtsx_usb.h
index 3247ed8e9ff0fb2c5571d6dd55e1845b3125fc0c..f267a06c6b1e7ef3c5b87684fe32182fd28caa80 100644 (file)
--- a/include/linux/rtsx_usb.h
+++ b/include/linux/rtsx_usb.h
@@ -12,6 +12,10 @@
 
 #include <linux/usb.h>
 
+#define DRV_NAME_RTSX_USB              "rtsx_usb"
+#define DRV_NAME_RTSX_USB_SDMMC                "rtsx_usb_sdmmc"
+#define DRV_NAME_RTSX_USB_MS           "rtsx_usb_ms"
+
 /* related module names */
 #define RTSX_USB_SD_CARD       0
 #define RTSX_USB_MS_CARD       1