From patchwork Fri May 18 10:31:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 10409513 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8B2DF60230 for ; Fri, 18 May 2018 10:41:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 78ED428908 for ; Fri, 18 May 2018 10:41:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A2C0288EA; Fri, 18 May 2018 10:41:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E96E6288EA for ; Fri, 18 May 2018 10:41:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=U0KxDU8YQUpwJvBk78HhIV0oBhE48yabFi8zBKU57mU=; b=M6wtnDApJTQEnnrNwYUzxpoEB7 wJ1zKlY6V702YSyr7DAh4+MSgAw/UF82/zfM4TEsk0RPp011bJeCiaSG/1vyNSUnaj3JuoqAUZcio 3nogMG9EhAnPJIEBegflz8XARM+u2YDEDAbVftFNIKNGu5hBf6ogGLY8NRdXidmMCuErstYyPzDiL 77dVGCqC4ZrJd/MtXMiIL1DqBn7LoHVseDxsvKeHYjWCepsLsTt3MTYc0sIFUZ77Uvmx2DvUJE+bE +t8nHwbpczkcdSczXStNEONQZ42+NV7dDUuJmIk7AlJ8c1RwF+HEgXlXTXDUSS32fl2l+llzWLBv/ RDwaHvQA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fJcpL-0007JY-Bq; Fri, 18 May 2018 10:41:35 +0000 Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fJcg5-0001Hp-Sm for linux-arm-kernel@lists.infradead.org; Fri, 18 May 2018 10:32:20 +0000 Received: by mail-lf0-x243.google.com with SMTP id n18-v6so13181532lfh.10 for ; Fri, 18 May 2018 03:31:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tR0PqVnyqpAIqwNNOSqwkpFdimOYd4PJO2b808P7gkQ=; b=LCBFqQ9uL7zZ7tojJ9j4HjEgPfSroxwirJNmmwZ/8UXKLxJvGImZuUZe3VZdYwaizx Zp+V+zgQR66pIvvKmXtUriWDzs1UC5/QjaVJjpeFWYt3UNd+HneZ7N01piHHflW4q76y cXjctC1TLCyKFXbraEN902WQHHbM2AFJ/DibU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tR0PqVnyqpAIqwNNOSqwkpFdimOYd4PJO2b808P7gkQ=; b=pefihaq76/iDof4Y2SWTdzOjE/8rADcDv3b6eYUdjnj5Q9KAHh2TgNsp4b1yVbGfax R3W+sNoFQl4+VusMJDHmueGzwjLX3AO35j555CpfHAv2niq/r4RnWPcN1D+nUw6euG4b OBRTUpNOY5kEc5oZ3bTfEno6QGMmrYgu+POc1TqhFC2Rjk1vTsbdIfRunqmLW2/TQ707 w+NewFfe5JK0kFGdLwaPnn1YraJIoHIF7GchotIL/nl4ssjrYcjF8CMZB/nYAkKK5CmX ONZ69N6ldKXqjnyzn7YYiD+GIaejp1MiK3nZrAs+oNTa5OQ640aBw8o9lxzmNLROzoYl G+Jw== X-Gm-Message-State: ALKqPwfz0W9S29h207oF9cfED3YLSHBLpqmqf5+yhqVWvciVnp89QQuE LgYLrFyOdXDJw/48Od8bAPS01g== X-Google-Smtp-Source: AB8JxZrBvFRNg3Bh/JNsQLtIhPmiYn7cpO3FRnyTqs5tj2c5eZHv2zm6Qe64JwBRGHy380U6qOwofw== X-Received: by 2002:a2e:97d6:: with SMTP id m22-v6mr5601140ljj.102.1526639509845; Fri, 18 May 2018 03:31:49 -0700 (PDT) Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id u14-v6sm393447lfk.55.2018.05.18.03.31.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 May 2018 03:31:49 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , linux-pm@vger.kernel.org Subject: [PATCH 2/9] PM / Domains: Drop __pm_genpd_add_device() Date: Fri, 18 May 2018 12:31:23 +0200 Message-Id: <1526639490-12167-3-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1526639490-12167-1-git-send-email-ulf.hansson@linaro.org> References: <1526639490-12167-1-git-send-email-ulf.hansson@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180518_033201_958455_D3EAACE9 X-CRM114-Status: GOOD ( 14.38 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ulf Hansson , Rajendra Nayak , Geert Uytterhoeven , Kevin Hilman , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Jon Hunter , Todor Tomov , Viresh Kumar , linux-tegra@vger.kernel.org, Vincent Guittot , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP There are still a few non-DT existing users of genpd, however neither of them uses __pm_genpd_add_device(), hence let's drop it. Signed-off-by: Ulf Hansson --- drivers/base/power/domain.c | 10 ++++------ include/linux/pm_domain.h | 14 +++----------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index da6c886..d58aee3 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1414,23 +1414,21 @@ static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, } /** - * __pm_genpd_add_device - Add a device to an I/O PM domain. + * pm_genpd_add_device - Add a device to an I/O PM domain. * @genpd: PM domain to add the device to. * @dev: Device to be added. - * @td: Set of PM QoS timing parameters to attach to the device. */ -int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, - struct gpd_timing_data *td) +int pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev) { int ret; mutex_lock(&gpd_list_lock); - ret = genpd_add_device(genpd, dev, td); + ret = genpd_add_device(genpd, dev, NULL); mutex_unlock(&gpd_list_lock); return ret; } -EXPORT_SYMBOL_GPL(__pm_genpd_add_device); +EXPORT_SYMBOL_GPL(pm_genpd_add_device); static int genpd_remove_device(struct generic_pm_domain *genpd, struct device *dev) diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index c847e9a..79888fb 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -143,8 +143,7 @@ static inline struct generic_pm_domain_data *dev_gpd_data(struct device *dev) return to_gpd_data(dev->power.subsys_data->domain_data); } -int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, - struct gpd_timing_data *td); +int pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev); int pm_genpd_remove_device(struct generic_pm_domain *genpd, struct device *dev); int pm_genpd_add_subdomain(struct generic_pm_domain *genpd, struct generic_pm_domain *new_subdomain); @@ -163,9 +162,8 @@ static inline struct generic_pm_domain_data *dev_gpd_data(struct device *dev) { return ERR_PTR(-ENOSYS); } -static inline int __pm_genpd_add_device(struct generic_pm_domain *genpd, - struct device *dev, - struct gpd_timing_data *td) +static inline int pm_genpd_add_device(struct generic_pm_domain *genpd, + struct device *dev) { return -ENOSYS; } @@ -204,12 +202,6 @@ static inline int dev_pm_genpd_set_performance_state(struct device *dev, #define pm_domain_always_on_gov (*(struct dev_power_governor *)(NULL)) #endif -static inline int pm_genpd_add_device(struct generic_pm_domain *genpd, - struct device *dev) -{ - return __pm_genpd_add_device(genpd, dev, NULL); -} - #ifdef CONFIG_PM_GENERIC_DOMAINS_SLEEP void pm_genpd_syscore_poweroff(struct device *dev); void pm_genpd_syscore_poweron(struct device *dev);