From patchwork Wed Oct 2 08:30: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: 20740 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ye0-f198.google.com (mail-ye0-f198.google.com [209.85.213.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D0A1325E05 for ; Wed, 2 Oct 2013 08:31:00 +0000 (UTC) Received: by mail-ye0-f198.google.com with SMTP id m11sf854400yen.1 for ; Wed, 02 Oct 2013 01:31:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state: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=XskLC81ykECNx/Z3d2j274YaLoxQaLEdO7xEiaWcxzN01hET+9w843beEs+lw8y1wu srPU7pfSmhRw37G8BsWPbVK/chVc9ggl7hqQutBXpBd8eWz/edr3q+OBBpgKvubnlDfy pJiG7iKaS9f6cjClq9XRa27RdtpjUMwfcHNcz8+SzatQyTocr83wtQH1A4R4iebcMtIH qmYI3hrBlHNKorCkrnLauJkQQoNzQwDNKCkM8H/KGzTOBL+L/Z1S5pHXCfOhCkWCafN5 lvkJL964pqdlOBapPyp7M6q0XbGHFggtbK4DqH/ZfMbCz/oDlUH/sauLqUDijphHL/J1 KwQw== X-Received: by 10.236.6.134 with SMTP id 6mr1039528yhn.7.1380702660658; Wed, 02 Oct 2013 01:31:00 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.37.170 with SMTP id z10ls400401qej.32.gmail; Wed, 02 Oct 2013 01:31:00 -0700 (PDT) X-Received: by 10.52.75.228 with SMTP id f4mr746528vdw.6.1380702660525; Wed, 02 Oct 2013 01:31:00 -0700 (PDT) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by mx.google.com with ESMTPS id st7si84618vdc.146.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 02 Oct 2013 01:31:00 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.179 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.179; Received: by mail-ve0-f179.google.com with SMTP id c14so314040vea.10 for ; Wed, 02 Oct 2013 01:31:00 -0700 (PDT) X-Gm-Message-State: ALoCoQlQUCsqkliUL3hEg1vSuYC8yl/WP37lL5Y6YiNjbrsuV5XzVJKYicEpbHtgfeRq+dtkf/FB X-Received: by 10.52.26.69 with SMTP id j5mr756031vdg.21.1380702660419; Wed, 02 Oct 2013 01:31:00 -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 u4csp79355vcz; Wed, 2 Oct 2013 01:30:59 -0700 (PDT) X-Received: by 10.112.210.136 with SMTP id mu8mr1261756lbc.25.1380702659056; Wed, 02 Oct 2013 01:30:59 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com [209.85.215.43]) by mx.google.com with ESMTPS id qh9si646008lbb.82.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 02 Oct 2013 01:30:59 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.43 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.215.43; Received: by mail-la0-f43.google.com with SMTP id ep20so350154lab.30 for ; Wed, 02 Oct 2013 01:30:58 -0700 (PDT) X-Received: by 10.112.29.147 with SMTP id k19mr1268736lbh.9.1380702658468; Wed, 02 Oct 2013 01:30:58 -0700 (PDT) Received: from linaro-ulf.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id e4sm890041lba.15.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 02 Oct 2013 01:30:57 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson , Guennadi Liakhovetski Subject: [PATCH 1/7] mmc: sh_mmcif: Move away from using deprecated APIs Date: Wed, 2 Oct 2013 10:30:45 +0200 Message-Id: <1380702651-13389-2-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1380702651-13389-1-git-send-email-ulf.hansson@linaro.org> References: <1380702651-13389-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.179 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