memstick: rtsx_pci_ms: Convert to platform remove callback returning void

[linux-2.6-block.git] / drivers / memstick / host / rtsx_pci_ms.c

diff --git a/drivers/memstick/host/rtsx_pci_ms.c b/drivers/memstick/host/rtsx_pci_ms.c
index 7c6dba6de230cbb507ea0dbf646ed1d9b7180d52..980a54513e6c6ef1911c530643032e95e92fd589 100644 (file)
--- a/drivers/memstick/host/rtsx_pci_ms.c
+++ b/drivers/memstick/host/rtsx_pci_ms.c
@@ -574,7 +574,7 @@ 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;
@@ -610,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[] = {
@@ -625,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,