From patchwork Tue Feb 4 15:58:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 316649 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id F293B2C0091 for ; Wed, 5 Feb 2014 03:04:49 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754677AbaBDQEM (ORCPT ); Tue, 4 Feb 2014 11:04:12 -0500 Received: from mail-la0-f52.google.com ([209.85.215.52]:51106 "EHLO mail-la0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754656AbaBDP7a (ORCPT ); Tue, 4 Feb 2014 10:59:30 -0500 Received: by mail-la0-f52.google.com with SMTP id c6so6718289lan.11 for ; Tue, 04 Feb 2014 07:59:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eWkHS8vTj9WagKIWi4MVc9wFOn50PeCZSAq9UpTnDcM=; b=LWPWoqVElkrSPDr3+Jq1Iz/s8CyFOJqtdmdWYRPS38BbDIMbNGnjUQa71mSXhbj4hW Z1AYjFiWyB5I4IL3QPitZJtUh3Vv4HkmFrmvW5rA02Wkn4lvBryTZhmAT72mGReSVXSK A1n1FkHs1iN3GWD0dxQ5S3Zes+9gA42G4J27p7fL6yaouh4EciRD25OjZ2iNqKZANwb0 gADnk/VH/86pFyV7bpEafngyBSWw2Ps6Hx9xDOvneZapjsp9T7R3KA6R8D490hqcYQSy 1LVfGjNDwswIC9SWkXB+sy+H10tYT05GH10N85SGbNkcZuKLx2l6/SD+lKDPhPwDOJpG dUUQ== X-Gm-Message-State: ALoCoQniRpuzeDyULLq1JIbiipXsJrNqDvUz79Q9C57N6lZFubUlBhcKjrNRn28XL3e27lDmfLiE X-Received: by 10.152.219.37 with SMTP id pl5mr2484436lac.36.1391529568514; Tue, 04 Feb 2014 07:59:28 -0800 (PST) Received: from localhost.localdomain (host-95-199-220-119.mobileonline.telia.com. [95.199.220.119]) by mx.google.com with ESMTPSA id dm8sm35906603lad.7.2014.02.04.07.59.26 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 07:59:27 -0800 (PST) From: Ulf Hansson To: Russell King , linux-arm-kernel@lists.infradead.org Cc: Alessandro Rubini , Linus Walleij , Wolfram Sang , Chris Ball , Mark Brown , linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, linux-spi@vger.kernel.org, linux-mmc@vger.kernel.org, Ulf Hansson Subject: [PATCH 04/17] mmc: mmci: Let runtime PM callbacks be available for CONFIG_PM Date: Tue, 4 Feb 2014 16:58:45 +0100 Message-Id: <1391529538-21685-5-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1391529538-21685-1-git-send-email-ulf.hansson@linaro.org> References: <1391529538-21685-1-git-send-email-ulf.hansson@linaro.org> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org 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 178868a..c88da1c 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1753,7 +1753,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; @@ -1821,7 +1821,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[] = {