]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
memstick: rtsx_usb_ms: Use ms_dev() helper
authorKai-Heng Feng <kai.heng.feng@canonical.com>
Fri, 11 Jan 2019 08:30:00 +0000 (09:30 +0100)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Mon, 14 Jan 2019 09:28:55 +0000 (09:28 +0000)
BugLink: https://bugs.launchpad.net/bugs/1811337
Use ms_dev() helper for consistency.

Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Tested-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit ba9d5f83735fc00297e39ba5cd9ece1c61eb3995)
Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
Acked-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
drivers/memstick/host/rtsx_usb_ms.c

index e95e64974a9104185c5bc67b750b140104fd8931..24e9e6acf01a9c4783bf953c6061def13a09d159 100644 (file)
@@ -786,7 +786,7 @@ static int rtsx_usb_ms_drv_remove(struct platform_device *pdev)
 
        mutex_lock(&host->host_mutex);
        if (host->req) {
-               dev_dbg(&(pdev->dev),
+               dev_dbg(ms_dev(host),
                        "%s: Controller removed during transfer\n",
                        dev_name(&msh->dev));
                host->req->error = -ENOMEDIUM;
@@ -808,10 +808,10 @@ static int rtsx_usb_ms_drv_remove(struct platform_device *pdev)
        if (pm_runtime_active(ms_dev(host)))
                pm_runtime_put(ms_dev(host));
 
-       pm_runtime_disable(&pdev->dev);
+       pm_runtime_disable(ms_dev(host));
        platform_set_drvdata(pdev, NULL);
 
-       dev_dbg(&(pdev->dev),
+       dev_dbg(ms_dev(host),
                ": Realtek USB Memstick controller has been removed\n");
 
        return 0;