From patchwork Wed Jul 22 17:48:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rafael J. Wysocki" X-Patchwork-Id: 6845471 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 62A19C05AC for ; Wed, 22 Jul 2015 17:22:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 84938206CC for ; Wed, 22 Jul 2015 17:21:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A2FD2206B2 for ; Wed, 22 Jul 2015 17:21:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757199AbbGVRVx (ORCPT ); Wed, 22 Jul 2015 13:21:53 -0400 Received: from v094114.home.net.pl ([79.96.170.134]:47295 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1757185AbbGVRVw (ORCPT ); Wed, 22 Jul 2015 13:21:52 -0400 Received: from aerr155.neoplus.adsl.tpnet.pl (79.191.199.155) (HELO vostro.rjw.lan) by serwer1319399.home.pl (79.96.170.134) with SMTP (IdeaSmtpServer v0.80) id 3160c9d5cb621791; Wed, 22 Jul 2015 19:21:51 +0200 From: "Rafael J. Wysocki" To: Linux PM list , Viresh Kumar Cc: Linux Kernel Mailing List Subject: [PATCH v2] cpufreq: Drop unnecessary arguments from two functions Date: Wed, 22 Jul 2015 19:48:38 +0200 Message-ID: <1661535.WGIelkkBTd@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/4.1.0-rc5+; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1710735.NHMxY7dJsV@vostro.rjw.lan> References: <1710735.NHMxY7dJsV@vostro.rjw.lan> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-8.1 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 From: Rafael J. Wysocki Subject: cpufreq: Drop unnecessary arguments from two functions After commit 9b07109f06a1 (cpufreq: Fix double addition of sysfs links) The second sif argument of __cpufreq_remove_dev_prepare() and __cpufreq_remove_dev_finish() is not used by them any more, so drop it. Signed-off-by: Rafael J. Wysocki --- Rebased on top of: http://git.kernel.org/cgit/linux/kernel/git/rafael/linux-pm.git/commit/?h=bleeding-edge&id=9b07109f06a1edd6e636b1e7397157eae0e6baa4 Note: The above commit is on a testing branch only at the moment. --- drivers/cpufreq/cpufreq.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-pm/drivers/cpufreq/cpufreq.c =================================================================== --- linux-pm.orig/drivers/cpufreq/cpufreq.c +++ linux-pm/drivers/cpufreq/cpufreq.c @@ -1376,8 +1376,7 @@ out_release_rwsem: return ret; } -static int __cpufreq_remove_dev_prepare(struct device *dev, - struct subsys_interface *sif) +static int __cpufreq_remove_dev_prepare(struct device *dev) { unsigned int cpu = dev->id; int ret = 0; @@ -1429,8 +1428,7 @@ static int __cpufreq_remove_dev_prepare( return ret; } -static int __cpufreq_remove_dev_finish(struct device *dev, - struct subsys_interface *sif) +static int __cpufreq_remove_dev_finish(struct device *dev) { unsigned int cpu = dev->id; int ret; @@ -1480,9 +1478,9 @@ static int cpufreq_remove_dev(struct dev return 0; if (cpu_online(cpu)) { - ret = __cpufreq_remove_dev_prepare(dev, sif); + ret = __cpufreq_remove_dev_prepare(dev); if (!ret) - ret = __cpufreq_remove_dev_finish(dev, sif); + ret = __cpufreq_remove_dev_finish(dev); if (ret) return ret; } @@ -2376,11 +2374,11 @@ static int cpufreq_cpu_callback(struct n break; case CPU_DOWN_PREPARE: - __cpufreq_remove_dev_prepare(dev, NULL); + __cpufreq_remove_dev_prepare(dev); break; case CPU_POST_DEAD: - __cpufreq_remove_dev_finish(dev, NULL); + __cpufreq_remove_dev_finish(dev); break; case CPU_DOWN_FAILED: