From patchwork Wed Oct 2 08:30:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 2973351 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 503C49F88A for ; Wed, 2 Oct 2013 08:31:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3DBB72018C for ; Wed, 2 Oct 2013 08:31:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 895C12012C for ; Wed, 2 Oct 2013 08:31:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753188Ab3JBIbE (ORCPT ); Wed, 2 Oct 2013 04:31:04 -0400 Received: from mail-lb0-f173.google.com ([209.85.217.173]:45967 "EHLO mail-lb0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753151Ab3JBIbD (ORCPT ); Wed, 2 Oct 2013 04:31:03 -0400 Received: by mail-lb0-f173.google.com with SMTP id o14so455935lbi.32 for ; Wed, 02 Oct 2013 01:31:01 -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=JjjLgYq6aGcCgk4AsnQ9NFdJCVPIlvIGdykSwuyz/bM=; b=ZTvzkpmHS3ghjM73kWkHvKQoAnodJAAEWhd3dJtghj6vjiH+rWg8jHqdcERUrArTY7 hBAcgP2Px6vgia5wiqCm6CR6xfgkZkZud7Cwafmcj7vbf9Sc0CAbH4846a9uYT7xEFYQ uTGxbgQCMpSdB1hBhc+Liuxq3xnBdlxtae295gKtKlP3DQutNQddxVWcyuAAI8raWcj3 /n5gRg2whl5yS+huEkq4bbdHf2un5RAY04YjoeXKsgJ10uJy5vwBT6beF/1SvypbpeMB fv24D27QWx6bq4HSJJC+qyPp+wcY9bGm987rNav+m6aBBFWrijUBfS9xRss2GsLxoBGI 9pHg== X-Gm-Message-State: ALoCoQlMZpIL0BLJxSVTub6HfY/Hiqkttppm+eJPpMQkApM1hiwXmEu4wWqmfBun/B8s4Y60Hik9 X-Received: by 10.152.170.166 with SMTP id an6mr1000657lac.20.1380702661514; Wed, 02 Oct 2013 01:31:01 -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 e4sm890041lba.15.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 02 Oct 2013 01:31:00 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson , Guennadi Liakhovetski Subject: [PATCH 2/7] mmc: sh_mmcif: Convert to PM macros when defining dev_pm_ops Date: Wed, 2 Oct 2013 10:30:46 +0200 Message-Id: <1380702651-13389-3-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1380702651-13389-1-git-send-email-ulf.hansson@linaro.org> References: <1380702651-13389-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=-7.6 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 Use SET_SYSTEM_SLEEP_PM_OPS to simplify code. Cc: Guennadi Liakhovetski Signed-off-by: Ulf Hansson --- drivers/mmc/host/sh_mmcif.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index 6bffebe..32bc412 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c @@ -1538,7 +1538,7 @@ static int sh_mmcif_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int sh_mmcif_suspend(struct device *dev) { struct sh_mmcif_host *host = dev_get_drvdata(dev); @@ -1552,10 +1552,7 @@ static int sh_mmcif_resume(struct device *dev) { return 0; } -#else -#define sh_mmcif_suspend NULL -#define sh_mmcif_resume NULL -#endif /* CONFIG_PM */ +#endif static const struct of_device_id mmcif_of_match[] = { { .compatible = "renesas,sh-mmcif" }, @@ -1564,8 +1561,7 @@ static const struct of_device_id mmcif_of_match[] = { MODULE_DEVICE_TABLE(of, mmcif_of_match); static const struct dev_pm_ops sh_mmcif_dev_pm_ops = { - .suspend = sh_mmcif_suspend, - .resume = sh_mmcif_resume, + SET_SYSTEM_SLEEP_PM_OPS(sh_mmcif_suspend, sh_mmcif_resume) }; static struct platform_driver sh_mmcif_driver = {