From patchwork Thu Sep 26 14:54:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 20621 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f199.google.com (mail-vc0-f199.google.com [209.85.220.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BF57E24687 for ; Thu, 26 Sep 2013 14:56:33 +0000 (UTC) Received: by mail-vc0-f199.google.com with SMTP id lf12sf1069292vcb.6 for ; Thu, 26 Sep 2013 07:56:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=Lh/1d0wP3IowB0uke4ZB3Mgc1XaySBfc9cnnVFsXW80=; b=D0x65XlRtt3VvBay7XLyqfr6kvi16xvZ4Iok30WgCpJJHn/Av8E/W2qesmBqrNDBxp TJimpOsoY0TwaQC7V5N+BINS7eQerhGubTlKKFxLr8Flv2lwqfH9xjGtu0wFqQJyNhnp pGrHJ4ruu5R26aCFfSjauW9EhuR0uVKXEDSva9B7FhwIqHHTEfP4UfRUpTnPA6KkcttB J5EPk1+wqhMUYJd5Orcjmet9cxNbli3saEzNKeJio03u+z7vl/QVt5VSIa3qDT6qArDF JdoAexYvZKwiPKSwS9hVdCofaThruN9ZylLXFSkWtgToh5CbvdVIN0uQrKTizrDHh22N 6b1w== X-Gm-Message-State: ALoCoQkjK8dmsjnlb98EAL83SzfBBiXopK3+CHGRM0ywx21DeF12ArmIJZ4YiOmRkdRjY+kbVo7H X-Received: by 10.236.223.130 with SMTP id v2mr276535yhp.34.1380207393602; Thu, 26 Sep 2013 07:56:33 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.71.168 with SMTP id w8ls867878qeu.64.gmail; Thu, 26 Sep 2013 07:56:33 -0700 (PDT) X-Received: by 10.58.50.97 with SMTP id b1mr1041753veo.32.1380207393430; Thu, 26 Sep 2013 07:56:33 -0700 (PDT) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by mx.google.com with ESMTPS id o3si501370ves.48.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:56:33 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.173; Received: by mail-ve0-f173.google.com with SMTP id cz12so971278veb.18 for ; Thu, 26 Sep 2013 07:56:03 -0700 (PDT) X-Received: by 10.58.196.148 with SMTP id im20mr1019245vec.28.1380207363324; Thu, 26 Sep 2013 07:56:03 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp371136vcz; Thu, 26 Sep 2013 07:56:02 -0700 (PDT) X-Received: by 10.14.2.2 with SMTP id 2mr731164eee.92.1380207362248; Thu, 26 Sep 2013 07:56:02 -0700 (PDT) Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com [74.125.83.49]) by mx.google.com with ESMTPS id x49si1892575een.24.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:56:02 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.83.49 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=74.125.83.49; Received: by mail-ee0-f49.google.com with SMTP id d41so595590eek.8 for ; Thu, 26 Sep 2013 07:56:01 -0700 (PDT) X-Received: by 10.14.126.69 with SMTP id a45mr1832584eei.65.1380207361525; Thu, 26 Sep 2013 07:56:01 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id x47sm4813555eea.16.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:56:00 -0700 (PDT) From: Ulf Hansson To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson , Pierre Ossman Subject: [PATCH 20/27] mmc: wbsd: Move away from using deprecated APIs Date: Thu, 26 Sep 2013 16:54:45 +0200 Message-Id: <1380207292-16968-21-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1380207292-16968-1-git-send-email-ulf.hansson@linaro.org> References: <1380207292-16968-1-git-send-email-ulf.hansson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Suspend and resume of cards are being handled from the protocol layer and consequently the mmc_suspend|resume_host APIs are deprecated. This means we can simplify the suspend|resume callbacks by removing the use of the deprecated APIs. Cc: Pierre Ossman Signed-off-by: Ulf Hansson --- drivers/mmc/host/wbsd.c | 33 +++++---------------------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/drivers/mmc/host/wbsd.c b/drivers/mmc/host/wbsd.c index e954b77..024c824 100644 --- a/drivers/mmc/host/wbsd.c +++ b/drivers/mmc/host/wbsd.c @@ -1814,28 +1814,11 @@ static void wbsd_pnp_remove(struct pnp_dev *dev) #ifdef CONFIG_PM -static int wbsd_suspend(struct wbsd_host *host, pm_message_t state) -{ - BUG_ON(host == NULL); - - return mmc_suspend_host(host->mmc); -} - -static int wbsd_resume(struct wbsd_host *host) -{ - BUG_ON(host == NULL); - - wbsd_init_device(host); - - return mmc_resume_host(host->mmc); -} - static int wbsd_platform_suspend(struct platform_device *dev, pm_message_t state) { struct mmc_host *mmc = platform_get_drvdata(dev); struct wbsd_host *host; - int ret; if (mmc == NULL) return 0; @@ -1844,12 +1827,7 @@ static int wbsd_platform_suspend(struct platform_device *dev, host = mmc_priv(mmc); - ret = wbsd_suspend(host, state); - if (ret) - return ret; - wbsd_chip_poweroff(host); - return 0; } @@ -1872,7 +1850,8 @@ static int wbsd_platform_resume(struct platform_device *dev) */ mdelay(5); - return wbsd_resume(host); + wbsd_init_device(host); + return 0; } #ifdef CONFIG_PNP @@ -1886,10 +1865,7 @@ static int wbsd_pnp_suspend(struct pnp_dev *pnp_dev, pm_message_t state) return 0; DBGF("Suspending...\n"); - - host = mmc_priv(mmc); - - return wbsd_suspend(host, state); + return 0; } static int wbsd_pnp_resume(struct pnp_dev *pnp_dev) @@ -1922,7 +1898,8 @@ static int wbsd_pnp_resume(struct pnp_dev *pnp_dev) */ mdelay(5); - return wbsd_resume(host); + wbsd_init_device(host); + return 0; } #endif /* CONFIG_PNP */