From patchwork Thu Apr 10 13:01:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 28186 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 27F4A212DC for ; Thu, 10 Apr 2014 13:01:41 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id il7sf11403426vcb.9 for ; Thu, 10 Apr 2014 06:01:40 -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=rRa3I+5JX31qfrFG59uMR1BjpjjsrMpyylfMA9KA7HY=; b=cJ1TzKvnwgTdKf7MTotp9CGx8H9QV8GDqxkFiKdlJzFpNhUiZ+R2AxmeT3HDWcQ1J8 WObaFWMCXjG/Ww7JRrG8bz0zgcydddVDXfxzPTvEbghIKjAhzbzxWs3rRwG+tP9m9bwt modFA/S57p5Az3I+af5UxQ9kajz1BSaPM2cCIZ3mOJybITFyi5gxSKsydoehdesK9XrX w1/eyG0l+J0pppOrLDhpukCXpH23NXVd+XQhLtLEwUzmXFbF6a2BnTbQVDsI9R8jk3I2 gEz+uRdLMwbz/ZgQJgGp46ygUvl4bPq3c0Rey4z2gvoPD/+S1cjjhrY4bKs9wiRRHC7y c0hA== X-Gm-Message-State: ALoCoQnRBtR/twKTc5daamlLxLPfHnL8AvROgh8IaeEE94JGN8GpETJYluKH7raCbYu05kRGMDG4 X-Received: by 10.58.199.170 with SMTP id jl10mr8207609vec.1.1397134900926; Thu, 10 Apr 2014 06:01:40 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.97.8 with SMTP id l8ls1102151qge.27.gmail; Thu, 10 Apr 2014 06:01:40 -0700 (PDT) X-Received: by 10.58.202.133 with SMTP id ki5mr13960342vec.19.1397134900776; Thu, 10 Apr 2014 06:01:40 -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 dr8si678144vcb.121.2014.04.10.06.01.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Apr 2014 06:01:40 -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 sa20so3295292veb.36 for ; Thu, 10 Apr 2014 06:01:40 -0700 (PDT) X-Received: by 10.220.133.80 with SMTP id e16mr14473698vct.13.1397134900707; Thu, 10 Apr 2014 06:01:40 -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 ib8csp57315vcb; Thu, 10 Apr 2014 06:01:40 -0700 (PDT) X-Received: by 10.180.7.227 with SMTP id m3mr14905501wia.59.1397134899940; Thu, 10 Apr 2014 06:01:39 -0700 (PDT) Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com [74.125.82.45]) by mx.google.com with ESMTPS id 3si1521557wjm.76.2014.04.10.06.01.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Apr 2014 06:01:39 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.45 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=74.125.82.45; Received: by mail-wg0-f45.google.com with SMTP id l18so3877940wgh.28 for ; Thu, 10 Apr 2014 06:01:39 -0700 (PDT) X-Received: by 10.194.118.163 with SMTP id kn3mr1049774wjb.77.1397134899531; Thu, 10 Apr 2014 06:01:39 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id lb4sm6500371wjb.14.2014.04.10.06.01.38 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Apr 2014 06:01:38 -0700 (PDT) From: Ulf Hansson To: linux-arm-kernel@lists.infradead.org, Russell King Cc: Linus Walleij , Kevin Hilman , Daniel Lezcano , Ulf Hansson Subject: [PATCH 2/3] mmc: mmci: Let runtime PM callbacks be available for CONFIG_PM Date: Thu, 10 Apr 2014 15:01:31 +0200 Message-Id: <1397134892-20840-3-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1397134892-20840-1-git-send-email-ulf.hansson@linaro.org> References: <1397134892-20840-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: , Convert to the SET_PM_RUNTIME_PM macro while defining the runtime PM callbacks. This means the callbacks becomes available for both CONFIG_PM_SLEEP and CONFIG_PM_RUNTIME, which is needed to handle the combinations of these scenarios. Cc: Russell King Signed-off-by: Ulf Hansson --- drivers/mmc/host/mmci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 0f10e3c..eb23c89 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1789,7 +1789,7 @@ static int mmci_resume(struct device *dev) } #endif -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static void mmci_save(struct mmci_host *host) { unsigned long flags; @@ -1857,7 +1857,7 @@ static int mmci_runtime_resume(struct device *dev) static const struct dev_pm_ops mmci_dev_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(mmci_suspend, mmci_resume) - SET_RUNTIME_PM_OPS(mmci_runtime_suspend, mmci_runtime_resume, NULL) + SET_PM_RUNTIME_PM_OPS(mmci_runtime_suspend, mmci_runtime_resume, NULL) }; static struct amba_id mmci_ids[] = {