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: 38705 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D06D220549 for ; Tue, 14 Oct 2014 11:45:33 +0000 (UTC) Received: by mail-lb0-f197.google.com with SMTP id p9sf5206952lbv.0 for ; Tue, 14 Oct 2014 04:45:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=c6KXi3ZGvHzREq0wIr6Hgm0WtVnuZEpYmlqr3heWo+4=; b=T2JlGFfKL9rSMRl4XLXZb9aJWxHsEh63ZxPwthStdlDMVVJJAGbC0h1sj582DqON52 tb3zre5k/XUvMCwNiQ9rcwDUnOI0IwcIeRGbEWAIgO/Kiv4WQXBuO1dZYwX4K1y/OL7R /a64iPRQer3YPhxYQzusKK/U/zAi7TGKNFYwR6rCAAyyfed7QElj3gnP+/R/Knyzk2yk j3/iyY3b7fBYTjZJS8/AcrrkDQy97jYGoba/7HhLc1TgAfYVDHGgThfT7r2zdu1BB1Tz aCN2H+JnF/gE9N9d0TWHb7ijOL0CyGLt+8NufdLPghgOS3WZZ4GhsGZgUScEvnk+twEC IDpg== X-Gm-Message-State: ALoCoQkm8peXWXatrHA/PwRxtgEmOFInKs9yss0xkRpbPh4Fd/OAEAZDUHqoMK4C9Vn0Fgx3XANP X-Received: by 10.112.26.82 with SMTP id j18mr72899lbg.16.1413287132545; Tue, 14 Oct 2014 04:45:32 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.5.43 with SMTP id cj11ls100583lad.85.gmail; Tue, 14 Oct 2014 04:45:32 -0700 (PDT) X-Received: by 10.112.26.71 with SMTP id j7mr2434836lbg.96.1413287132051; Tue, 14 Oct 2014 04:45:32 -0700 (PDT) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com [209.85.217.180]) by mx.google.com with ESMTPS id p7si26103547lbr.56.2014.10.14.04.45.32 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 14 Oct 2014 04:45:32 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) client-ip=209.85.217.180; Received: by mail-lb0-f180.google.com with SMTP id n15so7932535lbi.39 for ; Tue, 14 Oct 2014 04:45:32 -0700 (PDT) X-Received: by 10.152.120.200 with SMTP id le8mr4612058lab.67.1413287131977; Tue, 14 Oct 2014 04:45:31 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.84.229 with SMTP id c5csp377689lbz; Tue, 14 Oct 2014 04:45:31 -0700 (PDT) X-Received: by 10.112.247.43 with SMTP id yb11mr4712361lbc.51.1413287131565; Tue, 14 Oct 2014 04:45:31 -0700 (PDT) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com [209.85.215.47]) by mx.google.com with ESMTPS id pd3si25867598lbc.80.2014.10.14.04.45.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 14 Oct 2014 04:45:31 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by mail-la0-f47.google.com with SMTP id pv20so8193428lab.6 for ; Tue, 14 Oct 2014 04:45:31 -0700 (PDT) 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> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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)