From patchwork Thu Sep 26 14:54:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 20604 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ye0-f199.google.com (mail-ye0-f199.google.com [209.85.213.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 82EFC24687 for ; Thu, 26 Sep 2013 14:55:42 +0000 (UTC) Received: by mail-ye0-f199.google.com with SMTP id l4sf1030628yen.10 for ; Thu, 26 Sep 2013 07:55: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=7J5mDpD5uyUaO+jHoZLe3Af94vU3kol0mB9kxavgvNQ=; b=RRvSIl/orTDo8ZEV7E3c7NrXtZVB7kHNi6xZZeQhjV5oL6xsWXcEtqf4RRzvLYEqTd /ygn+ABKFXyOyIMR9N5K0YnBaj0HJCa7NS0VStq+croqo6IlTTN/LGWZwHY2YkzDqPGi fUZCwXvitxtGhTEwArMebdxKy+xlf71RUwJ27bEBQsCDvTcPuhzfvKmG75T1nP8LBlYL S/hI1k4yqCOQs6EyTpLNj4t8BIeB1Fv8yvV6YiR0tU3w5AamXdvTkzNpPXdFCwjeANtr Qu7LKuBX9ejzAv2SzGvsDVpO0jgRm3fc9fjqiFRnN/fMxBPUQKKWWYHbF93NzKBg9c/l ffqw== X-Gm-Message-State: ALoCoQmFBvKq4b62wUk7jn884yVGJ6fC68BawzNy0m9zGNfV4iDGl7rQHhH5ultGeX/z6+6YBGxt X-Received: by 10.236.88.129 with SMTP id a1mr249081yhf.40.1380207342293; Thu, 26 Sep 2013 07:55:42 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.47.82 with SMTP id b18ls988586qen.53.gmail; Thu, 26 Sep 2013 07:55:42 -0700 (PDT) X-Received: by 10.58.196.148 with SMTP id im20mr1017876vec.28.1380207342132; Thu, 26 Sep 2013 07:55:42 -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 fx4si503550vdc.26.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:55:42 -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 p13so907321vbe.19 for ; Thu, 26 Sep 2013 07:55:12 -0700 (PDT) X-Received: by 10.52.108.230 with SMTP id hn6mr874513vdb.28.1380207311352; Thu, 26 Sep 2013 07:55:11 -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 u4csp371085vcz; Thu, 26 Sep 2013 07:55:10 -0700 (PDT) X-Received: by 10.15.35.196 with SMTP id g44mr2005270eev.18.1380207310347; Thu, 26 Sep 2013 07:55:10 -0700 (PDT) Received: from mail-ea0-f175.google.com (mail-ea0-f175.google.com [209.85.215.175]) by mx.google.com with ESMTPS id x42si1879336eea.74.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:55:10 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.175 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.215.175; Received: by mail-ea0-f175.google.com with SMTP id m14so609480eaj.34 for ; Thu, 26 Sep 2013 07:55:09 -0700 (PDT) X-Received: by 10.14.198.197 with SMTP id v45mr1973214een.52.1380207309808; Thu, 26 Sep 2013 07:55:09 -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:09 -0700 (PDT) From: Ulf Hansson To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson , Sonic Zhang , uclinux-dist-devel@blackfin.uclinux.org Subject: [PATCH 03/27] mmc: bfin_sdh: Move away from using deprecated APIs Date: Thu, 26 Sep 2013 16:54:28 +0200 Message-Id: <1380207292-16968-4-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.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: Sonic Zhang Cc: uclinux-dist-devel@blackfin.uclinux.org Signed-off-by: Ulf Hansson --- drivers/mmc/host/bfin_sdh.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/mmc/host/bfin_sdh.c b/drivers/mmc/host/bfin_sdh.c index 94fae2f..bc9110f 100644 --- a/drivers/mmc/host/bfin_sdh.c +++ b/drivers/mmc/host/bfin_sdh.c @@ -640,21 +640,15 @@ static int sdh_remove(struct platform_device *pdev) #ifdef CONFIG_PM static int sdh_suspend(struct platform_device *dev, pm_message_t state) { - struct mmc_host *mmc = platform_get_drvdata(dev); struct bfin_sd_host *drv_data = get_sdh_data(dev); - int ret = 0; - - if (mmc) - ret = mmc_suspend_host(mmc); peripheral_free_list(drv_data->pin_req); - return ret; + return 0; } static int sdh_resume(struct platform_device *dev) { - struct mmc_host *mmc = platform_get_drvdata(dev); struct bfin_sd_host *drv_data = get_sdh_data(dev); int ret = 0; @@ -665,10 +659,6 @@ static int sdh_resume(struct platform_device *dev) } sdh_reset(); - - if (mmc) - ret = mmc_resume_host(mmc); - return ret; } #else