From patchwork Tue Aug 12 16:14:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 4713411 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 1B3519F375 for ; Tue, 12 Aug 2014 16:15:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4758020108 for ; Tue, 12 Aug 2014 16:15:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 19D24200E1 for ; Tue, 12 Aug 2014 16:15:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753135AbaHLQPw (ORCPT ); Tue, 12 Aug 2014 12:15:52 -0400 Received: from mail-wg0-f41.google.com ([74.125.82.41]:46732 "EHLO mail-wg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753507AbaHLQOk (ORCPT ); Tue, 12 Aug 2014 12:14:40 -0400 Received: by mail-wg0-f41.google.com with SMTP id z12so10123256wgg.0 for ; Tue, 12 Aug 2014 09:14:38 -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=0shqLD6xDzK+yumzDjFRbzmpz6i1jNr6jwlBvgKmnkY=; b=DYF/GMOY1ZY7j2bSnbfgCF69ymRN2Op5TZ97vVyhhnDP4bdpWYKTbejRLf5rRoD59Y HF1eUUTKZRUmxW1buJKydCpep/j8TRBST3Of8S4F8bYb1G+JIi0Ouc2JtKsR/PdsiwoN zF9fls/vhRjsn23wuFlLQGR8pAtrAvmd1/iiwQrswILQRC5tQrejQ7Ki1pdLjvj+oWe7 rMaD3VpGqxzu4V2LfqNan0nCG9a202MMMenyBTq8ZMqV5yD9bLs626PxutIp52ilM0SB Br6X11KSVilVw5/bTNs0sgSilYKDLfyBU8SYtGTfEaQnUIt0oKvXKTAzFZVxefFAQmoz s5yQ== X-Gm-Message-State: ALoCoQllGJCEEYCwTflns7XHRYXsoemPP73+4geWfQICSiIL5f+RSlUsQDfjzMVnLy1gJ07ss9dQ X-Received: by 10.194.90.4 with SMTP id bs4mr6302794wjb.71.1407860078793; Tue, 12 Aug 2014 09:14:38 -0700 (PDT) Received: from localhost.localdomain (cpc14-aztw22-2-0-cust189.18-1.cable.virginm.net. [82.45.1.190]) by mx.google.com with ESMTPSA id td10sm57731219wic.10.2014.08.12.09.14.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 12 Aug 2014 09:14:38 -0700 (PDT) From: Peter Griffin To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, tgih.jun@samsung.com, jh80.chung@samsung.com, chris@printf.net, ulf.hansson@linaro.org, jarkko.lavinen@nokia.com, balajitk@ti.com, baohua@kernel.org, viresh.linux@gmail.com, ian.molton@codethink.co.uk, maxime.ripard@free-electrons.com, linux-mmc@vger.kernel.org, linux-omap@vger.kernel.org, spear-devel@list.st.com, linux-tegra@vger.kernel.org, michal.simek@xilinx.com, swarren@wwwdotorg.org Cc: peter.griffin@linaro.org, patches@linaro.org, lee.jones@linaro.org Subject: [PATCH 2/5] mmc: dw_mmc-pci: Remove superflous #else condition on CONFIG_PM_SLEEP Date: Tue, 12 Aug 2014 17:14:26 +0100 Message-Id: <1407860069-12706-3-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1407860069-12706-1-git-send-email-peter.griffin@linaro.org> References: <1407860069-12706-1-git-send-email-peter.griffin@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 As the code is using SIMPLE_DEV_PM_OPS helper, this compiles away to nothing if CONFIG_PM_SLEEP is disabled. Thus we don't need to #define the suspend/resume callbacks to NULL. Signed-off-by: Peter Griffin --- drivers/mmc/host/dw_mmc-pci.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/mmc/host/dw_mmc-pci.c b/drivers/mmc/host/dw_mmc-pci.c index f70546a..5523b84 100644 --- a/drivers/mmc/host/dw_mmc-pci.c +++ b/drivers/mmc/host/dw_mmc-pci.c @@ -95,9 +95,6 @@ static int dw_mci_pci_resume(struct device *dev) return dw_mci_resume(host); } -#else -#define dw_mci_pci_suspend NULL -#define dw_mci_pci_resume NULL #endif /* CONFIG_PM_SLEEP */ static SIMPLE_DEV_PM_OPS(dw_mci_pci_pmops, dw_mci_pci_suspend, dw_mci_pci_resume);