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: 2948871 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0515ABFF0B for ; Thu, 26 Sep 2013 14:59:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EE561202AB for ; Thu, 26 Sep 2013 14:59:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D4227201EA for ; Thu, 26 Sep 2013 14:59:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752775Ab3IZO6u (ORCPT ); Thu, 26 Sep 2013 10:58:50 -0400 Received: from mail-ea0-f177.google.com ([209.85.215.177]:37945 "EHLO mail-ea0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753308Ab3IZO4C (ORCPT ); Thu, 26 Sep 2013 10:56:02 -0400 Received: by mail-ea0-f177.google.com with SMTP id f15so599958eak.22 for ; Thu, 26 Sep 2013 07:56:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Lh/1d0wP3IowB0uke4ZB3Mgc1XaySBfc9cnnVFsXW80=; b=HQu3r8HKP1EnBnfPKKfcP3BkZpsbj1fbiVG2r2TS4S7X7uW+yE1mUabU0EXoNT0/bO KJZ5dxvwhC3uRAqtklZzTWJ1GxWZWW15NB2V3EPhik4nVM/EeZ4aRDk8tbgnjWDRA6vs U36UL0CzLkVgndSHSC7aIds9pcd/RAlzw/s57Qep5PVTrbzerOSHFKvqWbOP5s8a1GK5 ZWRbCJ+irvOAoheaXGmDqFgR6pZEyyRowzK8vPtrRdeYuTC2LkWuV69Al3cy/JAl4SCp CsK0ScHXrH5P0DCxDGdSvRsjs/382tZ/zBVrr2ILAe0jVDqY9l/2X093cyN8QDKJ2xrP yoCA== X-Gm-Message-State: ALoCoQn8BZkdPSW18SN+iXoCBRoFxjvFnTPjtWl5kWjTqD3IFK8d+o0irKrZWTtXqBxceNLmQ2gt 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> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 */