diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-07 13:17:52 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-07 13:17:52 +0000 |
| commit | 3afb00d3f86d3d924f88b56fa8285d4e9db85852 (patch) | |
| tree | 95a985d3019522cea546b7d8df621369bc44fc6c /drivers/memstick/host | |
| parent | Adding debian version 6.9.12-1. (diff) | |
| download | linux-3afb00d3f86d3d924f88b56fa8285d4e9db85852.tar.xz linux-3afb00d3f86d3d924f88b56fa8285d4e9db85852.zip | |
Merging upstream version 6.10.3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'drivers/memstick/host')
| -rw-r--r-- | drivers/memstick/host/rtsx_pci_ms.c | 9 | ||||
| -rw-r--r-- | drivers/memstick/host/rtsx_usb_ms.c | 6 |
2 files changed, 4 insertions, 11 deletions
diff --git a/drivers/memstick/host/rtsx_pci_ms.c b/drivers/memstick/host/rtsx_pci_ms.c index 15720a4afa..980a54513e 100644 --- a/drivers/memstick/host/rtsx_pci_ms.c +++ b/drivers/memstick/host/rtsx_pci_ms.c @@ -574,16 +574,13 @@ static int rtsx_pci_ms_drv_probe(struct platform_device *pdev) return 0; } -static int rtsx_pci_ms_drv_remove(struct platform_device *pdev) +static void rtsx_pci_ms_drv_remove(struct platform_device *pdev) { struct realtek_pci_ms *host = platform_get_drvdata(pdev); struct rtsx_pcr *pcr; struct memstick_host *msh; int rc; - if (!host) - return 0; - pcr = host->pcr; pcr->slots[RTSX_MS_CARD].p_dev = NULL; pcr->slots[RTSX_MS_CARD].card_event = NULL; @@ -613,8 +610,6 @@ static int rtsx_pci_ms_drv_remove(struct platform_device *pdev) dev_dbg(&(pdev->dev), ": Realtek PCI-E Memstick controller has been removed\n"); - - return 0; } static struct platform_device_id rtsx_pci_ms_ids[] = { @@ -628,7 +623,7 @@ MODULE_DEVICE_TABLE(platform, rtsx_pci_ms_ids); static struct platform_driver rtsx_pci_ms_driver = { .probe = rtsx_pci_ms_drv_probe, - .remove = rtsx_pci_ms_drv_remove, + .remove_new = rtsx_pci_ms_drv_remove, .id_table = rtsx_pci_ms_ids, .suspend = rtsx_pci_ms_suspend, .resume = rtsx_pci_ms_resume, diff --git a/drivers/memstick/host/rtsx_usb_ms.c b/drivers/memstick/host/rtsx_usb_ms.c index 29271ad472..246876ac71 100644 --- a/drivers/memstick/host/rtsx_usb_ms.c +++ b/drivers/memstick/host/rtsx_usb_ms.c @@ -805,7 +805,7 @@ err_out: return err; } -static int rtsx_usb_ms_drv_remove(struct platform_device *pdev) +static void rtsx_usb_ms_drv_remove(struct platform_device *pdev) { struct rtsx_usb_ms *host = platform_get_drvdata(pdev); struct memstick_host *msh = host->msh; @@ -840,8 +840,6 @@ static int rtsx_usb_ms_drv_remove(struct platform_device *pdev) ": Realtek USB Memstick controller has been removed\n"); memstick_free_host(msh); platform_set_drvdata(pdev, NULL); - - return 0; } static struct platform_device_id rtsx_usb_ms_ids[] = { @@ -855,7 +853,7 @@ MODULE_DEVICE_TABLE(platform, rtsx_usb_ms_ids); static struct platform_driver rtsx_usb_ms_driver = { .probe = rtsx_usb_ms_drv_probe, - .remove = rtsx_usb_ms_drv_remove, + .remove_new = rtsx_usb_ms_drv_remove, .id_table = rtsx_usb_ms_ids, .driver = { .name = "rtsx_usb_ms", |