From patchwork Mon Aug 25 12:25:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 4774051 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B5055C033A for ; Mon, 25 Aug 2014 12:27:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CDD342012D for ; Mon, 25 Aug 2014 12:27:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 05D872010F for ; Mon, 25 Aug 2014 12:27:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932371AbaHYM0j (ORCPT ); Mon, 25 Aug 2014 08:26:39 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:53751 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932348AbaHYM0h (ORCPT ); Mon, 25 Aug 2014 08:26:37 -0400 Received: by mail-wi0-f177.google.com with SMTP id ho1so2430755wib.16 for ; Mon, 25 Aug 2014 05:26:36 -0700 (PDT) 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=8qyqb3gzqUMccfIH5yHsDXrlqWnLt03098+fE0rbKnk=; b=iu/oxlPH1pBlq5gshpVMhg8oyG+6kyNzwfIeuMf54oKKEWjzbaWRhPf807dQ2fXx0X pe/t6BcbXoZmKuAhGclGiD8zSkZve+zw/MpP0UF0nMJLMKmQOjIQxFlZGam8f3h/4hpv KWGsHJYch8+SUQxJu2E5YR0YVB2P72ZVA1d+i6G+CR4FoE1dL1JjyZbKcJHfPJtlWtYt o0mCQ6YaVCa4idvgleabKEOxr1nnBmfVPq3f4Zy99hxCzIxYMXAOL0gs/XRfpph28+3+ SvRObkQYrdwh5O8/sLFHeDCxVOs5eT2Jxbo6uvwRL8GoNmTZV60GAhzTLl7XQ0kHazau NPlw== X-Gm-Message-State: ALoCoQk+Yif0XtGzt/vqDXZi8x5JONVUBxKSSd9eLOfk41NXnyn/TQf8q7trTGz1evG4KYhqgzdj X-Received: by 10.180.218.4 with SMTP id pc4mr15299846wic.15.1408969596596; Mon, 25 Aug 2014 05:26:36 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id u5sm145337wia.17.2014.08.25.05.26.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Aug 2014 05:26:36 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ian Molton , Chris Ball Cc: Geert Uytterhoeven , Linux-sh list , linux-kernel@vger.kernel.org, Ulf Hansson Subject: [PATCH 07/12] mmc: tmio: Make runtime PM callbacks available for CONFIG_PM Date: Mon, 25 Aug 2014 14:25:59 +0200 Message-Id: <1408969564-6335-8-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1408969564-6335-1-git-send-email-ulf.hansson@linaro.org> References: <1408969564-6335-1-git-send-email-ulf.hansson@linaro.org> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP To give the option for tmio hosts to use the runtime PM callbacks for CONFIG_PM_SLEEP as well as CONFIG_PM_RUNTIME, move them to CONFIG_PM. Signed-off-by: Ulf Hansson --- drivers/mmc/host/tmio_mmc.h | 2 +- drivers/mmc/host/tmio_mmc_pio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index f1ee3e4..2ad52d6 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -149,7 +149,7 @@ int tmio_mmc_host_suspend(struct device *dev); int tmio_mmc_host_resume(struct device *dev); #endif -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM int tmio_mmc_host_runtime_suspend(struct device *dev); int tmio_mmc_host_runtime_resume(struct device *dev); #endif diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index d52280d..494ecc5 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c @@ -1162,7 +1162,7 @@ int tmio_mmc_host_resume(struct device *dev) EXPORT_SYMBOL(tmio_mmc_host_resume); #endif -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM int tmio_mmc_host_runtime_suspend(struct device *dev) { struct mmc_host *mmc = dev_get_drvdata(dev);