From patchwork Thu Sep 26 14:54:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 20605 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f70.google.com (mail-vb0-f70.google.com [209.85.212.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1FC2324687 for ; Thu, 26 Sep 2013 14:55:47 +0000 (UTC) Received: by mail-vb0-f70.google.com with SMTP id h10sf1070858vbh.1 for ; Thu, 26 Sep 2013 07:55:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe:content-type :content-transfer-encoding; bh=qdhviG7o0CqCQCcCIKhj8zdIbwb2K+5GRKiiNxc1igA=; b=nKRM/HXdhGqiM+gT3i1eqHc4dF2n0Jnwo0boF3Q6aPtFYHNHQ2GWWVCLuvEHNO+q20 jJmdHRZud4BfNC3gjHN/NFZviJBLIoEiXzcu09RHRn+vH3PHIY/kDCswU13xw+yxs6KY Szgwo9Pw6AyNujyIY3svNT1Gt3ugacnt0ibOdtHRHRJUHh746sv0JXXKIc0Wgs0i938k BiC84s8fTS8+AZYm5GC9E84m7sKrGz81xn/DRtXKDS52I2Ee5rAi2G1As9NUwzV6Vfj3 fyAm5WiRbauAEFx/VViiuRIHu/RiIYmqdl6w7eQ75vd9FNPrNGary0mNTMJtIjQvJnjc GQSw== X-Gm-Message-State: ALoCoQnKKbhVDHF/3WRD7vBgAZ/boZrsX/J5XnaISVljBJePyA9f45/RfS3gimy6R1zLLKzy0kmo X-Received: by 10.236.147.18 with SMTP id s18mr269391yhj.28.1380207346916; Thu, 26 Sep 2013 07:55:46 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.25.66 with SMTP id a2ls877754qeg.95.gmail; Thu, 26 Sep 2013 07:55:46 -0700 (PDT) X-Received: by 10.52.65.136 with SMTP id x8mr853070vds.23.1380207346808; Thu, 26 Sep 2013 07:55:46 -0700 (PDT) Received: from mail-vb0-f53.google.com (mail-vb0-f53.google.com [209.85.212.53]) by mx.google.com with ESMTPS id wp10si493038vdb.97.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:55:46 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.53 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.53; Received: by mail-vb0-f53.google.com with SMTP id i3so925620vbh.12 for ; Thu, 26 Sep 2013 07:55:16 -0700 (PDT) X-Received: by 10.221.32.133 with SMTP id sk5mr1004509vcb.27.1380207316712; Thu, 26 Sep 2013 07:55:16 -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 u4csp371088vcz; Thu, 26 Sep 2013 07:55:16 -0700 (PDT) X-Received: by 10.14.180.73 with SMTP id i49mr1858817eem.55.1380207315678; Thu, 26 Sep 2013 07:55:15 -0700 (PDT) Received: from mail-ea0-f173.google.com (mail-ea0-f173.google.com [209.85.215.173]) by mx.google.com with ESMTPS id f46si1880990eeo.69.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:55:15 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.173 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.215.173; Received: by mail-ea0-f173.google.com with SMTP id g10so611982eak.32 for ; Thu, 26 Sep 2013 07:55:15 -0700 (PDT) X-Received: by 10.14.10.72 with SMTP id 48mr1950043eeu.82.1380207315155; Thu, 26 Sep 2013 07:55:15 -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:55:14 -0700 (PDT) From: Ulf Hansson To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson , =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Subject: [PATCH 04/27] mmc: cb710: Move away from using deprecated APIs Date: Thu, 26 Sep 2013 16:54:29 +0200 Message-Id: <1380207292-16968-5-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> MIME-Version: 1.0 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.212.53 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: Michał Mirosław Signed-off-by: Ulf Hansson --- drivers/mmc/host/cb710-mmc.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/mmc/host/cb710-mmc.c b/drivers/mmc/host/cb710-mmc.c index 9d6e2b8..1087b4c 100644 --- a/drivers/mmc/host/cb710-mmc.c +++ b/drivers/mmc/host/cb710-mmc.c @@ -667,12 +667,6 @@ static const struct mmc_host_ops cb710_mmc_host = { static int cb710_mmc_suspend(struct platform_device *pdev, pm_message_t state) { struct cb710_slot *slot = cb710_pdev_to_slot(pdev); - struct mmc_host *mmc = cb710_slot_to_mmc(slot); - int err; - - err = mmc_suspend_host(mmc); - if (err) - return err; cb710_mmc_enable_irq(slot, 0, ~0); return 0; @@ -681,11 +675,9 @@ static int cb710_mmc_suspend(struct platform_device *pdev, pm_message_t state) static int cb710_mmc_resume(struct platform_device *pdev) { struct cb710_slot *slot = cb710_pdev_to_slot(pdev); - struct mmc_host *mmc = cb710_slot_to_mmc(slot); cb710_mmc_enable_irq(slot, 0, ~0); - - return mmc_resume_host(mmc); + return 0; } #endif /* CONFIG_PM */