From patchwork Tue Oct 14 11:45:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 5079541 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 EEE23C11AD for ; Tue, 14 Oct 2014 11:45:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3850A2012F for ; Tue, 14 Oct 2014 11:45:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5A7A820179 for ; Tue, 14 Oct 2014 11:45:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755180AbaJNLpd (ORCPT ); Tue, 14 Oct 2014 07:45:33 -0400 Received: from mail-la0-f44.google.com ([209.85.215.44]:36207 "EHLO mail-la0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755061AbaJNLpd (ORCPT ); Tue, 14 Oct 2014 07:45:33 -0400 Received: by mail-la0-f44.google.com with SMTP id hs14so8371293lab.3 for ; Tue, 14 Oct 2014 04:45:31 -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=c6KXi3ZGvHzREq0wIr6Hgm0WtVnuZEpYmlqr3heWo+4=; b=PC2F32PGUnye9OtW5vfPkn7/nXsXyQKwcc7klJK173Su3xsfhn1oeI+J3Ia+Yh0AIc IM8AsSiKlsnxxqoxoWQtirR63rebKP7rxZjRxcuU8yBIiVAmUI1/zaCwJgIkDdlCD6Ep UH8shf9sWNr08AOuGp5uvYzefNgV54NBayFFAoIjA5cTkIA5b7D2mbkUBxyiFBhvKtjW 2ifIadbuKBZfOh1kbtNwBymSPh1bX/oVmty/qDQX3ScHVaD8UNkTgkO1qTERAqB28URs AqkzS8rJs/QxG4xeDt0GlsJyTqyYh/TPUwEmCzks/m35ZGe4A7CsPtPdlvMScbKjTc37 4vDQ== X-Gm-Message-State: ALoCoQkAVqMWxVTwGWGWBBf6Q7PAz1BC8rdZtf3GOeXB971ncBQufizq3Hdjv5VnzP/eixIGzkbv X-Received: by 10.152.161.195 with SMTP id xu3mr4705731lab.15.1413287131432; Tue, 14 Oct 2014 04:45:31 -0700 (PDT) Received: from uffe-Latitude-E6430s.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id xh2sm5520440lbb.7.2014.10.14.04.45.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Oct 2014 04:45:30 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson Subject: [PATCH 1/7] mmc: core: Remove superfluous ifdefs for SDIO bus' PM callbacks Date: Tue, 14 Oct 2014 13:45:14 +0200 Message-Id: <1413287120-10914-2-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1413287120-10914-1-git-send-email-ulf.hansson@linaro.org> References: <1413287120-10914-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, T_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 Signed-off-by: Ulf Hansson --- drivers/mmc/core/sdio_bus.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c index e4eb456..5c02367 100644 --- a/drivers/mmc/core/sdio_bus.c +++ b/drivers/mmc/core/sdio_bus.c @@ -195,8 +195,6 @@ static int sdio_bus_remove(struct device *dev) return ret; } -#ifdef CONFIG_PM - static const struct dev_pm_ops sdio_bus_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(pm_generic_suspend, pm_generic_resume) SET_RUNTIME_PM_OPS( @@ -206,14 +204,6 @@ static const struct dev_pm_ops sdio_bus_pm_ops = { ) }; -#define SDIO_PM_OPS_PTR (&sdio_bus_pm_ops) - -#else /* !CONFIG_PM */ - -#define SDIO_PM_OPS_PTR NULL - -#endif /* !CONFIG_PM */ - static struct bus_type sdio_bus_type = { .name = "sdio", .dev_groups = sdio_dev_groups, @@ -221,7 +211,7 @@ static struct bus_type sdio_bus_type = { .uevent = sdio_bus_uevent, .probe = sdio_bus_probe, .remove = sdio_bus_remove, - .pm = SDIO_PM_OPS_PTR, + .pm = &sdio_bus_pm_ops, }; int sdio_register_bus(void)