From patchwork Tue Oct 22 14:07:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 21210 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f197.google.com (mail-ie0-f197.google.com [209.85.223.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B0371244B2 for ; Tue, 22 Oct 2013 14:07:37 +0000 (UTC) Received: by mail-ie0-f197.google.com with SMTP id e14sf2852875iej.0 for ; Tue, 22 Oct 2013 07:07:37 -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=epaLmzXfk5C+vo9jpNFpr3YMccODybeh6EKZqzkkHc/NTSy6JreJQ/iSvacgeBJYrE 4oOc93rPKMu7z6UHyZZQsrO8m35eE0jVhAqAiZlHrVTpqhwIRvSsCxbVW5Mn4BlPWCGR N1dUkYTCaKKCfESDbDfpU1sYGgvvIGZ7P0YOhEbw8X/pDZN3v4CJwSu1ryyLyDO7xWQq u/xAmH461YxrbvhqnwftRULQadUDDVN1v+NVHPp7EkTIJyII5gvwpKZKVuqCGP/4WItV QBaj0tEdHE7YL08wzDyd3/najgF4FbMKpVjxrSvR3pInaZEtIXDglrMcDYpfilchgIIy GuLg== X-Received: by 10.182.158.4 with SMTP id wq4mr8917376obb.18.1382450857055; Tue, 22 Oct 2013 07:07:37 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.74.35 with SMTP id q3ls128168qev.50.gmail; Tue, 22 Oct 2013 07:07:36 -0700 (PDT) X-Received: by 10.58.66.233 with SMTP id i9mr335730vet.29.1382450856663; Tue, 22 Oct 2013 07:07:36 -0700 (PDT) Received: from mail-vb0-f46.google.com (mail-vb0-f46.google.com [209.85.212.46]) by mx.google.com with ESMTPS id wp10si5804161vdb.84.2013.10.22.07.07.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 22 Oct 2013 07:07:36 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.46 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.46; Received: by mail-vb0-f46.google.com with SMTP id 10so4214604vbe.5 for ; Tue, 22 Oct 2013 07:07:36 -0700 (PDT) X-Gm-Message-State: ALoCoQk5WhbwOO/SJo66p2BFHlNkT3ZcexHPE8yqQ+1hxPgYWw1VdoXjMwhhDQs0KZi4u6qUuSZT X-Received: by 10.221.6.195 with SMTP id ol3mr88074vcb.34.1382450856536; Tue, 22 Oct 2013 07:07:36 -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 u4csp233638vcz; Tue, 22 Oct 2013 07:07:35 -0700 (PDT) X-Received: by 10.112.53.198 with SMTP id d6mr1434429lbp.47.1382450855304; Tue, 22 Oct 2013 07:07:35 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com [209.85.215.52]) by mx.google.com with ESMTPS id i8si9173653laa.18.2013.10.22.07.07.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 22 Oct 2013 07:07:35 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.52 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.215.52; Received: by mail-la0-f52.google.com with SMTP id eh20so1795463lab.25 for ; Tue, 22 Oct 2013 07:07:34 -0700 (PDT) X-Received: by 10.112.210.136 with SMTP id mu8mr17557647lbc.25.1382450854599; Tue, 22 Oct 2013 07:07:34 -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 ur6sm15932916lbc.5.2013.10.22.07.07.33 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 22 Oct 2013 07:07:33 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson , Guennadi Liakhovetski Subject: [PATCH v2 1/7] mmc: sh_mmcif: Move away from using deprecated APIs Date: Tue, 22 Oct 2013 16:07:20 +0200 Message-Id: <1382450846-17144-2-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1382450846-17144-1-git-send-email-ulf.hansson@linaro.org> References: <1382450846-17144-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.212.46 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