From patchwork Fri May 23 08:36:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 30681 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 019C52066E for ; Fri, 23 May 2014 08:36:50 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id i4sf21853557oah.9 for ; Fri, 23 May 2014 01:36:50 -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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=ZXPH4t8NMEg8Rph59cgndmLsOdtyVKevjKCgzlrQVDA=; b=DS1VZTxo+IrLZIxj3mel/hb2bph4rvXv4A5Sx3n8Rk+q43+I/jhFVBL+za0Pi2U3Ek Nk8WVa04mBZ1ZXYVlI8m97IlYbP8hEWzO/F6gFHeoQVmBEpXDrnQP7FXmvxKy/aaCSe0 jaWj0iHtY1TEQIrXSdhI6jRHLhTpF4LA60ZRLhqmFa4nmF0hYcSPewL2PwE7o68MZk8q Ic2lhadOSjVBV/MYfXJRYHw5XVYZsZxZCFam7eWKEOk0/NOc4/cL0HuJ7C+PC73Xirc2 NadcgRUr9u4zPRd/3UQFU2ZPzp0A3hFSCZSMnjWyTy/7irmdgrc0y+9N5Xy2bf/SaocY pFcQ== X-Gm-Message-State: ALoCoQnYBg1mEZp7zfQyIiP+7YDtyhrSMb0MagoHf7Oh9Aa1N/NwFBYKnCNcMa0kzjr6xvNMdMpL X-Received: by 10.182.3.6 with SMTP id 6mr1670111oby.2.1400834210524; Fri, 23 May 2014 01:36:50 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.23.147 with SMTP id 19ls1810596qgp.68.gmail; Fri, 23 May 2014 01:36:50 -0700 (PDT) X-Received: by 10.58.74.38 with SMTP id q6mr2832541vev.7.1400834210343; Fri, 23 May 2014 01:36:50 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id i5si1268448vcp.33.2014.05.23.01.36.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 May 2014 01:36:50 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id il7so5854429vcb.18 for ; Fri, 23 May 2014 01:36:50 -0700 (PDT) X-Received: by 10.52.185.72 with SMTP id fa8mr2533418vdc.12.1400834210237; Fri, 23 May 2014 01:36:50 -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.221.72 with SMTP id ib8csp12991vcb; Fri, 23 May 2014 01:36:49 -0700 (PDT) X-Received: by 10.152.87.176 with SMTP id az16mr2299578lab.43.1400834209102; Fri, 23 May 2014 01:36:49 -0700 (PDT) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com [209.85.215.41]) by mx.google.com with ESMTPS id gk9si4066250lbc.45.2014.05.23.01.36.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 May 2014 01:36:49 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.215.41 as permitted sender) client-ip=209.85.215.41; Received: by mail-la0-f41.google.com with SMTP id e16so3895709lan.28 for ; Fri, 23 May 2014 01:36:48 -0700 (PDT) X-Received: by 10.152.5.135 with SMTP id s7mr822727las.55.1400834208544; Fri, 23 May 2014 01:36:48 -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 w5sm1956453law.14.2014.05.23.01.36.46 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 May 2014 01:36:47 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson , Russell King Subject: [PATCH] mmc: sdhci-of-esdhc: Fixup compile error Date: Fri, 23 May 2014 10:36:44 +0200 Message-Id: <1400834204-1933-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) 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: , The commit below introduced compile errors, let's fix them. mmc: sdhci-of-esdhc: remove platform_suspend/platform_resume callbacks Cc: Russell King Signed-off-by: Ulf Hansson --- drivers/mmc/host/sdhci-of-esdhc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c index 605815e..8be4dcf 100644 --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c @@ -306,7 +306,7 @@ static int esdhc_of_suspend(struct device *dev) return sdhci_suspend_host(host); } -static void esdhc_of_resume(device *dev) +static int esdhc_of_resume(struct device *dev) { struct sdhci_host *host = dev_get_drvdata(dev); int ret = sdhci_resume_host(host); @@ -321,8 +321,8 @@ static void esdhc_of_resume(device *dev) } static const struct dev_pm_ops esdhc_pmops = { - .suspend = esdhci_of_suspend, - .resume = esdhci_of_resume, + .suspend = esdhc_of_suspend, + .resume = esdhc_of_resume, }; #define ESDHC_PMOPS (&esdhc_pmops) #else