From patchwork Wed Sep 3 10:52:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 4832741 Return-Path: X-Original-To: patchwork-linux-sh@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 BD7CBC0338 for ; Wed, 3 Sep 2014 10:53:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 09191202D1 for ; Wed, 3 Sep 2014 10:53:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8F4D7202EB for ; Wed, 3 Sep 2014 10:53:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756241AbaICKxJ (ORCPT ); Wed, 3 Sep 2014 06:53:09 -0400 Received: from mail-wi0-f170.google.com ([209.85.212.170]:43405 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756216AbaICKxH (ORCPT ); Wed, 3 Sep 2014 06:53:07 -0400 Received: by mail-wi0-f170.google.com with SMTP id cc10so5631190wib.1 for ; Wed, 03 Sep 2014 03:53:05 -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=Q6n0HgZF4oAD591bK4aRFZPB0ImgVl40f+jS5Ew6Z/o=; b=clij3j1vta86PzdhqRG6FLl+XMPZb0ihpWT3EjOS7gTC6PFx7Ij0J9GIYum0ASy5Ec YntmO69Ydg8Ka1hOhkF4IWn+19kYR1Gs3Sx8orZE8iIQuCYySlo/D/RkgMSQr5oKmQS0 NctmiYcUt6K2ten/cPxoFA16DlvCOgF90aRrV1G8Z7XAMWy47I9SDfpLLPYjCcVDQm/f tH2rKJhRWp/yFmLDi9B2z4Cg1ZGuRTIfI0JOLklpqG94kYyYhC/bwwtk2dwmTpjQhekZ BxomjreJrcbU0c1qCoscle/BJhgwPjKnLF/qvTJuJ498tZ47DKYYsOHRA5wzSJEzUBb1 6Dkg== X-Gm-Message-State: ALoCoQlsfLM0YCVqfeG5kFiobY8wIfhx8/5oEDdtzS5yDp1HNDrsrvOTz9CdGl7cPIdQOXJOW4ye X-Received: by 10.180.73.139 with SMTP id l11mr33962205wiv.30.1409741585168; Wed, 03 Sep 2014 03:53:05 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id j7sm3968190wia.9.2014.09.03.03.53.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Sep 2014 03:53:04 -0700 (PDT) From: Ulf Hansson To: "Rafael J. Wysocki" , Len Brown , Pavel Machek , linux-pm@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org, linux-samsung-soc@vger.kernel.org, Geert Uytterhoeven , Kevin Hilman , Daniel Lezcano , Tomasz Figa , Simon Horman , Magnus Damm , Ben Dooks , Kukjin Kim , Stephen Boyd , Philipp Zabel , Mark Brown , Ulf Hansson Subject: [PATCH 07/15] PM / Domains: Remove redundant check for CONFIG_PM Date: Wed, 3 Sep 2014 12:52:23 +0200 Message-Id: <1409741551-16437-8-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1409741551-16437-1-git-send-email-ulf.hansson@linaro.org> References: <1409741551-16437-1-git-send-email-ulf.hansson@linaro.org> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 CONFIG_PM_GENERIC_DOMAINS depends on CONFIG_PM, thus there are no need to check explicity for it. Signed-off-by: Ulf Hansson --- drivers/base/power/domain.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 4298a2b..b910d0f 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -66,8 +66,6 @@ static struct generic_pm_domain *pm_genpd_lookup_name(const char *domain_name) return genpd; } -#ifdef CONFIG_PM - struct generic_pm_domain *dev_to_genpd(struct device *dev) { if (IS_ERR_OR_NULL(dev->pm_domain)) @@ -281,8 +279,6 @@ int pm_genpd_name_poweron(const char *domain_name) return genpd ? pm_genpd_poweron(genpd) : -EINVAL; } -#endif /* CONFIG_PM */ - #ifdef CONFIG_PM_RUNTIME static int genpd_start_dev_no_timing(struct generic_pm_domain *genpd,