From patchwork Thu Sep 26 14:54:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 20624 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f199.google.com (mail-ve0-f199.google.com [209.85.128.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 82C6524687 for ; Thu, 26 Sep 2013 14:56:42 +0000 (UTC) Received: by mail-ve0-f199.google.com with SMTP id db12sf1096430veb.6 for ; Thu, 26 Sep 2013 07:56:42 -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=z3W3+wMlhZ5KR2ehD+sRuI5LqntyC5JiJ4RijDhj3hs=; b=aLlEtADyy/lA/gX2LXD901PMV8/mHKLdPgZKE5F4lh7pTPIQqVLeNl2+Kw3hBh+9TV XzXS0ydBsKE7fizpAf+BBZrSOmWtsw01Lgua3ZDM3f4MrgdX5ZCmkHpURP2EagwTYTum jO/6huz9VtG0iCUG+l+NCX+6jcbUFDl0B/iBMh3xNnKUb9HIJPf5vHbUAQz0/la3pvhr k2NaUUcFlHjjIrklXE90UFkzY7Rg3ViBan8KPRq5BDNfoG/eWsfjdbjE+539FTVAluea Uf8Puve/9x3zWzOBrGEI6aQ+MrjkbnCmQi1eqQgbHQxTTAgVHBWxvMfdXp+uWEqpPB0V 29uA== X-Gm-Message-State: ALoCoQn2REr5vZ0GZJrTxWNziQ2SmK2IdY5Tt7Juy8Uynis2aB872IK98lVafMVN/MJQQGb7kFpZ X-Received: by 10.236.13.36 with SMTP id a24mr261217yha.50.1380207402309; Thu, 26 Sep 2013 07:56:42 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.119.161 with SMTP id kv1ls906193qeb.10.gmail; Thu, 26 Sep 2013 07:56:42 -0700 (PDT) X-Received: by 10.52.33.44 with SMTP id o12mr853491vdi.7.1380207402175; Thu, 26 Sep 2013 07:56:42 -0700 (PDT) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id m10si500735vcm.57.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:56:42 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.177 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.177; Received: by mail-ve0-f177.google.com with SMTP id db12so965927veb.8 for ; Thu, 26 Sep 2013 07:56:12 -0700 (PDT) X-Received: by 10.58.108.74 with SMTP id hi10mr1065211veb.14.1380207372076; Thu, 26 Sep 2013 07:56:12 -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 u4csp371146vcz; Thu, 26 Sep 2013 07:56:11 -0700 (PDT) X-Received: by 10.15.45.8 with SMTP id a8mr1911822eew.1.1380207371169; Thu, 26 Sep 2013 07:56:11 -0700 (PDT) Received: from mail-ee0-f45.google.com (mail-ee0-f45.google.com [74.125.83.45]) by mx.google.com with ESMTPS id l42si1819976eef.328.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:56:11 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.83.45 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=74.125.83.45; Received: by mail-ee0-f45.google.com with SMTP id c50so617091eek.18 for ; Thu, 26 Sep 2013 07:56:10 -0700 (PDT) X-Received: by 10.15.64.1 with SMTP id n1mr1907001eex.15.1380207370520; Thu, 26 Sep 2013 07:56:10 -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:09 -0700 (PDT) From: Ulf Hansson To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson , Guennadi Liakhovetski Subject: [PATCH 23/27] mmc: sh_mmcif: Move away from using deprecated APIs Date: Thu, 26 Sep 2013 16:54:48 +0200 Message-Id: <1380207292-16968-24-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.177 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: Guennadi Liakhovetski Signed-off-by: Ulf Hansson --- drivers/mmc/host/sh_mmcif.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index 36629a0..6bffebe 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c @@ -1542,19 +1542,15 @@ static int sh_mmcif_remove(struct platform_device *pdev) static int sh_mmcif_suspend(struct device *dev) { struct sh_mmcif_host *host = dev_get_drvdata(dev); - int ret = mmc_suspend_host(host->mmc); - if (!ret) - sh_mmcif_writel(host->addr, MMCIF_CE_INT_MASK, MASK_ALL); + sh_mmcif_writel(host->addr, MMCIF_CE_INT_MASK, MASK_ALL); - return ret; + return 0; } static int sh_mmcif_resume(struct device *dev) { - struct sh_mmcif_host *host = dev_get_drvdata(dev); - - return mmc_resume_host(host->mmc); + return 0; } #else #define sh_mmcif_suspend NULL