memstick: rtsx_usb_ms: Convert to platform remove callback returning void

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

diff --git a/drivers/memstick/host/rtsx_usb_ms.c b/drivers/memstick/host/rtsx_usb_ms.c
index 29271ad4728a2f180a2c60c1468820a79d7b0b5a..246876ac713c25818a2e3eb632476004ccac885a 100644 (file)
--- 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",