From patchwork Fri Jan 11 08:30:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1023451 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="N0xE9Xcg"; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43bbfs0NyQz9sLw; Fri, 11 Jan 2019 19:31:01 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ghsDP-0005PP-Oe; Fri, 11 Jan 2019 08:30:55 +0000 Received: from mail-pg1-f195.google.com ([209.85.215.195]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ghsDN-0005Mz-Fx for kernel-team@lists.ubuntu.com; Fri, 11 Jan 2019 08:30:53 +0000 Received: by mail-pg1-f195.google.com with SMTP id z10so6034907pgp.7 for ; Fri, 11 Jan 2019 00:30:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=ddM4EkaZTlaiaWThzaX9aQeefa+SG8mYoT7abi5jGGM=; b=N0xE9XcgFjTvKB4RFq3YR/blEliPvUgaR4jBLuuQRChyNzC5pdevb4M+nQ2tPknrT2 x7MMYJRtapjMz9BzjgfSQ2F4zaBWQsVD4MJeyLY3sXg/2eh4je37Dq2QS+6CpiI6q2M8 MYYDbNgwudg65D/inj/UwmglJKdTRfU03xaLTxhHPfIeTQ0UiarVx+46FkaEQjawlS0q xPqf21woxEwHU+f0NGsRUEPRWnTKTl9ZDFMiU/lkhnKmf6OaYDO+dEVSnTfqEIw4kt6a e3i+ymEoM9R7AKJHQBlNJEBYEOoBZ5xMmqm3enWSpIExoo0rtnm4eUWpzR8bWeJRHscY zUJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=ddM4EkaZTlaiaWThzaX9aQeefa+SG8mYoT7abi5jGGM=; b=owTMVOckA0rzLWrLUtP3iouE7BsZpFQ/CgOiRBfgWugItgg0mDzRhB0BCZABT+m94S tNo/EVXAPImPCPLwsZqoutLKdqG6M10EJSGNwIZGx3pnR/9rGfcDoCCntCyDg3g8wt2d pqelTtisw+dWMHeWXCiL9uXZuovbolkzJgN8JEZrRclDBnzKr3FLfUt2GPkoThX0pvRr UjueHLki7S/vasEHzZmgGUTUahej7GlvYnF/+2tymCNuGrYy6ff5EPH4Edo1vJX9ZIY+ siIv1jqex4kAiZF2qiy5B5pQT4N1y/9NOJ4AUeRFLT+gZuggwnegl3k6gyyT/DjLzbVo oZ2Q== X-Gm-Message-State: AJcUukfv2/1+NGnEpY7zW1eVQKqIJBxnX4l3ReED3/Ej1DuZwCG+W7m7 1oM2NDOEZqw5oGED2fYVOmoB/zd3VO8= X-Google-Smtp-Source: ALg8bN7mB7vDxlTq+qn6op7CKMmKUbT1AlpOhcWVGLVNQizrRNQWHTXLUZdoS2NQ+xZDLxLKgPyGGg== X-Received: by 2002:a63:1e17:: with SMTP id e23mr10221982pge.130.1547195451474; Fri, 11 Jan 2019 00:30:51 -0800 (PST) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id y6sm144706926pfd.104.2019.01.11.00.30.50 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Jan 2019 00:30:50 -0800 (PST) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 11/12][SRU][B][C][D][OEM-B] memstick: rtsx_usb_ms: Use ms_dev() helper Date: Fri, 11 Jan 2019 16:30:18 +0800 Message-Id: <20190111083019.32135-12-acelan.kao@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190111083019.32135-1-acelan.kao@canonical.com> References: <20190111083019.32135-1-acelan.kao@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Kai-Heng Feng BugLink: https://bugs.launchpad.net/bugs/1811337 Use ms_dev() helper for consistency. Signed-off-by: Kai-Heng Feng Tested-by: Oleksandr Natalenko Signed-off-by: Ulf Hansson (cherry picked from commit ba9d5f83735fc00297e39ba5cd9ece1c61eb3995) Signed-off-by: AceLan Kao --- drivers/memstick/host/rtsx_usb_ms.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/memstick/host/rtsx_usb_ms.c b/drivers/memstick/host/rtsx_usb_ms.c index e95e64974a91..24e9e6acf01a 100644 --- a/drivers/memstick/host/rtsx_usb_ms.c +++ b/drivers/memstick/host/rtsx_usb_ms.c @@ -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;