From patchwork Mon Aug 25 12:26:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 4774121 Return-Path: X-Original-To: patchwork-linux-mmc@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 AF580C0338 for ; Mon, 25 Aug 2014 12:28:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BB13B200D6 for ; Mon, 25 Aug 2014 12:28:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E3BA82010C for ; Mon, 25 Aug 2014 12:28:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932347AbaHYM0m (ORCPT ); Mon, 25 Aug 2014 08:26:42 -0400 Received: from mail-we0-f171.google.com ([74.125.82.171]:41087 "EHLO mail-we0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932298AbaHYM0i (ORCPT ); Mon, 25 Aug 2014 08:26:38 -0400 Received: by mail-we0-f171.google.com with SMTP id p10so13149071wes.30 for ; Mon, 25 Aug 2014 05:26:37 -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=d/AuRgFr6yxhI88wo725m4QxZiDo4o/NDJfFp3ud5TI=; b=DkgYdYj7gyksASPSnuOce1I9ifu92o29QfpfdySbzH9I76G+UpKpnqs5iOCoS6CRiq yFiWAxZ7rlxFYYLRJYMb+Y5QpNb8rxVY4kW8NImsCWwfLWylePVENp01Vxs5jDj7oHTI BeOvPOvnbtdSMGou/guu2V/uKD5yYYxg91Ip0S0/yLa3vHX+QklonF/BqZvZGmvbrdGh byiBC0nBKF/SHHX566lE61JA8QrQqgSKIlIi1Jms/8OAqtdlzwIk2GP2v8ne39Y/D8eI dDzHJY4+aBXkun0rk8d5Er3fOTzRxPHG5Fu//E+utVn7qndusYnH1GcEkPmnbCrI42DW fn+w== X-Gm-Message-State: ALoCoQk7iIcQO+eyLiCdYwBYQnF1AqFKUW1PXwVsExHP+wXSivMUgqBsdbZtV11Xs4+WRG5996I0 X-Received: by 10.180.87.231 with SMTP id bb7mr15420676wib.63.1408969597777; Mon, 25 Aug 2014 05:26:37 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id u5sm145337wia.17.2014.08.25.05.26.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Aug 2014 05:26:37 -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 08/12] mmc: sdhi: Make runtime PM callbacks available for CONFIG_PM Date: Mon, 25 Aug 2014 14:26:00 +0200 Message-Id: <1408969564-6335-9-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-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@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 be able to simplify system PM, let's re-use the runtime PM callbacks by converting to the SET_PM_RUNTIME_PM_OPS macro. Signed-off-by: Ulf Hansson --- drivers/mmc/host/sh_mobile_sdhi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c index be5e25d..4cd0f09 100644 --- a/drivers/mmc/host/sh_mobile_sdhi.c +++ b/drivers/mmc/host/sh_mobile_sdhi.c @@ -333,7 +333,7 @@ static int sh_mobile_sdhi_remove(struct platform_device *pdev) static const struct dev_pm_ops tmio_mmc_dev_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(tmio_mmc_host_suspend, tmio_mmc_host_resume) - SET_RUNTIME_PM_OPS(tmio_mmc_host_runtime_suspend, + SET_PM_RUNTIME_PM_OPS(tmio_mmc_host_runtime_suspend, tmio_mmc_host_runtime_resume, NULL) };