From patchwork Thu Sep 26 14:54:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 20613 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f197.google.com (mail-qc0-f197.google.com [209.85.216.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E0A0524687 for ; Thu, 26 Sep 2013 14:56:10 +0000 (UTC) Received: by mail-qc0-f197.google.com with SMTP id r5sf1072807qcx.0 for ; Thu, 26 Sep 2013 07:56:10 -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=vFsKq0l8cAam1BEFFXRq4gA+zFGl/NYRTpLk+zd0pxA=; b=OzcejtrLInClpsIRjs+zRieJcgluySsyzltR7ctRqPkkdqYVsXut6SCIutlSsJClfn nOnoa18mGZkjZ0kwY/RQ4KmHKRA/Osr8wFU+pwsQrryuDgzBgbn1bmWnjrhPHONBY+Hx EfABLP6SeYGe03acr2DboxyZEoqjzJwC6dI1IU187RfYjlhS9IAa5urT6zZ3q785RJd7 bTduuFU6AZn45CXSL8cATocyxgdvtq+OnuMbRITYmA0iRNTEafO33XV4Qj/xP1e+bU6n LmUf62aG9Hx7LBsZ/vY41YJeddbSSDWeMHnrQ8n9J4NWiUgECvttCyj6TpLhjg1yCUl1 PaqA== X-Gm-Message-State: ALoCoQnRl0rfeNOeiggJOwbTfUJDR0JUffTyq1m7UvV7+4UiChdGg8pREMGa0YHPyQZ91ihDLflm X-Received: by 10.236.80.42 with SMTP id j30mr235209yhe.29.1380207370603; Thu, 26 Sep 2013 07:56:10 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.94.68 with SMTP id da4ls934546qeb.24.gmail; Thu, 26 Sep 2013 07:56:10 -0700 (PDT) X-Received: by 10.220.48.194 with SMTP id s2mr117577vcf.43.1380207370462; Thu, 26 Sep 2013 07:56:10 -0700 (PDT) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id gq10si499604vdc.56.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:56:10 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.174 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.174; Received: by mail-ve0-f174.google.com with SMTP id jy13so977118veb.33 for ; Thu, 26 Sep 2013 07:55:40 -0700 (PDT) X-Received: by 10.220.15.132 with SMTP id k4mr74171vca.45.1380207340358; Thu, 26 Sep 2013 07:55:40 -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 u4csp371104vcz; Thu, 26 Sep 2013 07:55:39 -0700 (PDT) X-Received: by 10.14.0.6 with SMTP id 6mr1938794eea.76.1380207339347; Thu, 26 Sep 2013 07:55:39 -0700 (PDT) Received: from mail-ea0-f171.google.com (mail-ea0-f171.google.com [209.85.215.171]) by mx.google.com with ESMTPS id 47si1817838eea.331.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:55:39 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.171 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.215.171; Received: by mail-ea0-f171.google.com with SMTP id n15so616757ead.16 for ; Thu, 26 Sep 2013 07:55:38 -0700 (PDT) X-Received: by 10.14.184.132 with SMTP id s4mr1903909eem.13.1380207338831; Thu, 26 Sep 2013 07:55:38 -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:38 -0700 (PDT) From: Ulf Hansson To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson , Alex Dubov Subject: [PATCH 12/27] mmc: tifm_sd: Move away from using deprecated APIs Date: Thu, 26 Sep 2013 16:54:37 +0200 Message-Id: <1380207292-16968-13-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.174 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: Alex Dubov Signed-off-by: Ulf Hansson --- drivers/mmc/host/tifm_sd.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/mmc/host/tifm_sd.c b/drivers/mmc/host/tifm_sd.c index 43d9628..d1760eb 100644 --- a/drivers/mmc/host/tifm_sd.c +++ b/drivers/mmc/host/tifm_sd.c @@ -1030,7 +1030,7 @@ static void tifm_sd_remove(struct tifm_dev *sock) static int tifm_sd_suspend(struct tifm_dev *sock, pm_message_t state) { - return mmc_suspend_host(tifm_get_drvdata(sock)); + return 0; } static int tifm_sd_resume(struct tifm_dev *sock) @@ -1044,8 +1044,6 @@ static int tifm_sd_resume(struct tifm_dev *sock) if (rc) host->eject = 1; - else - rc = mmc_resume_host(mmc); return rc; }