Commit f248ff14 authored by Desnes Nunes's avatar Desnes Nunes Committed by Greg Kroah-Hartman
Browse files

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: d0f45925 ("memstick: rtsx_pci_ms: Remove Realtek PCI memstick driver")
Signed-off-by: default avatarDesnes Nunes <desnesn@redhat.com>
Link: https://lore.kernel.org/r/20241031142801.1141680-1-desnesn@redhat.com


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

drivers/misc/cardreader/alcor_pci.c

+0 −2
Original line number Diff line number Diff line
@@ -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[] = {

drivers/misc/cardreader/rtsx_usb.c

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

include/linux/alcor_pci.h

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

include/linux/rtsx_common.h

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

include/linux/rtsx_usb.h

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