From patchwork Wed Nov 12 04:10:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 40637 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 20B04206A5 for ; Wed, 12 Nov 2014 04:11:13 +0000 (UTC) Received: by mail-wi0-f200.google.com with SMTP id h11sf1442927wiw.7 for ; Tue, 11 Nov 2014 20:11:12 -0800 (PST) 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:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=di9WpjVXw+iB8cl2ynt7V0mtmN675rHEhxqDXQFw+cs=; b=VcFtSSFYcpbtASuqk5pC5Sq0F0sGp3Gsh9Y+vC630svUZljJhgT5bDCNgIQ2sT626p 5idTyu4YRqtlKyruw4P8KRFQK+c+5MvbRF/lsH5urAC3XKm3EoxKtDjyM3eLXINbG2ZK im5J9EJB36JKplB/f13QDJfU3ksD2XFQnqzJiQJyJMqW5L5R7oXhEFzPnR+l/ez1xo8C GIvnn8Bu+DJfe1QmZZfQBGBNBRG+0yXtAB3obwm6JfuMqwDhmOsqEbiNgClTUmAODidq RX+cRHMeqQtAbDi+TrXM18iHuG8LNQerMzCD+GVsPzXIGTyllycWhmbuclSIpV6+EEpc GQvw== X-Gm-Message-State: ALoCoQmfzooBDe4j9aHS5P/CU0FkDVaO9uaAcGGl0BAg8/QAkRaD+BOaPsdR/YbaRdArl0UWwflp X-Received: by 10.112.119.194 with SMTP id kw2mr15556lbb.16.1415765472040; Tue, 11 Nov 2014 20:11:12 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.227 with SMTP id v3ls683333lav.91.gmail; Tue, 11 Nov 2014 20:11:11 -0800 (PST) X-Received: by 10.112.150.102 with SMTP id uh6mr9521726lbb.50.1415765471672; Tue, 11 Nov 2014 20:11:11 -0800 (PST) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id ap3si33562572lbc.33.2014.11.11.20.11.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Nov 2014 20:11:11 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by mail-la0-f51.google.com with SMTP id q1so10751157lam.10 for ; Tue, 11 Nov 2014 20:11:11 -0800 (PST) X-Received: by 10.112.73.103 with SMTP id k7mr39912477lbv.41.1415765471547; Tue, 11 Nov 2014 20:11:11 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp366358lbc; Tue, 11 Nov 2014 20:11:10 -0800 (PST) X-Received: by 10.70.136.164 with SMTP id qb4mr44833266pdb.36.1415765469891; Tue, 11 Nov 2014 20:11:09 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id mv8si13162239pdb.96.2014.11.11.20.11.09 for ; Tue, 11 Nov 2014 20:11:09 -0800 (PST) Received-SPF: none (google.com: linux-pm-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932255AbaKLELF (ORCPT + 12 others); Tue, 11 Nov 2014 23:11:05 -0500 Received: from mail-pd0-f180.google.com ([209.85.192.180]:55236 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753937AbaKLELD (ORCPT ); Tue, 11 Nov 2014 23:11:03 -0500 Received: by mail-pd0-f180.google.com with SMTP id ft15so11424712pdb.11 for ; Tue, 11 Nov 2014 20:11:03 -0800 (PST) X-Received: by 10.68.68.235 with SMTP id z11mr44032316pbt.102.1415765463160; Tue, 11 Nov 2014 20:11:03 -0800 (PST) Received: from localhost ([122.166.94.182]) by mx.google.com with ESMTPSA id nq2sm20708058pdb.74.2014.11.11.20.11.01 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 11 Nov 2014 20:11:02 -0800 (PST) From: Viresh Kumar To: Rafael Wysocki Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, scottwood@freescale.com, Yuantian.Tang@freescale.com, Viresh Kumar Subject: [PATCH] cpufreq: Remove architecture specific menu entries Date: Wed, 12 Nov 2014 09:40:43 +0530 Message-Id: <92d6fb45a43b8d800cbcdf690bbf6f8e4713b95e.1415765396.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.0.3.693.g996b0fd Sender: linux-pm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: viresh.kumar@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.215.51 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , CPUFreq driver's Kconfig entries are added in Kconfig. files and they are all included from the main Kconfig file using a menu entry. This creates another level of (unnecessary) hierarchy within the menuconfig entries. The problem occurs when there are drivers usable across architectures. Either their config entry is duplicated in all the supported architectures or is put into the main Kconfig entry. With the later one, we have menuconfig entries for drivers at two levels then. Fix these issues by getting rid of another level of menuconfig entries and populate all drivers within the main cpufreq menu. Reported-by: Tang Yuantian Suggested-by: Scott Wood Signed-off-by: Viresh Kumar --- drivers/cpufreq/Kconfig | 48 +++++++++++++++++------------------------------- 1 file changed, 17 insertions(+), 31 deletions(-) diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig index 3489f8f..a24d678 100644 --- a/drivers/cpufreq/Kconfig +++ b/drivers/cpufreq/Kconfig @@ -196,19 +196,19 @@ config CPUFREQ_DT If in doubt, say N. -menu "x86 CPU frequency scaling drivers" -depends on X86 +if X86 source "drivers/cpufreq/Kconfig.x86" -endmenu +endif -menu "ARM CPU frequency scaling drivers" -depends on ARM || ARM64 +if ARM || ARM64 source "drivers/cpufreq/Kconfig.arm" -endmenu +endif -menu "AVR32 CPU frequency scaling drivers" -depends on AVR32 +if PPC32 || PPC64 +source "drivers/cpufreq/Kconfig.powerpc" +endif +if AVR32 config AVR32_AT32AP_CPUFREQ bool "CPU frequency driver for AT32AP" depends on PLATFORM_AT32AP @@ -216,12 +216,9 @@ config AVR32_AT32AP_CPUFREQ help This enables the CPU frequency driver for AT32AP processors. If in doubt, say N. +endif -endmenu - -menu "CPUFreq processor drivers" -depends on IA64 - +if IA64 config IA64_ACPI_CPUFREQ tristate "ACPI Processor P-States driver" depends on ACPI_PROCESSOR @@ -232,12 +229,9 @@ config IA64_ACPI_CPUFREQ For details, take a look at . If in doubt, say N. +endif -endmenu - -menu "MIPS CPUFreq processor drivers" -depends on MIPS - +if MIPS config LOONGSON2_CPUFREQ tristate "Loongson2 CPUFreq Driver" help @@ -249,16 +243,9 @@ config LOONGSON2_CPUFREQ For details, take a look at . If in doubt, say N. +endif -endmenu - -menu "PowerPC CPU frequency scaling drivers" -depends on PPC32 || PPC64 -source "drivers/cpufreq/Kconfig.powerpc" -endmenu - -menu "SPARC CPU frequency scaling drivers" -depends on SPARC64 +if SPARC64 config SPARC_US3_CPUFREQ tristate "UltraSPARC-III CPU Frequency driver" help @@ -276,10 +263,9 @@ config SPARC_US2E_CPUFREQ For details, take a look at . If in doubt, say N. -endmenu +endif -menu "SH CPU Frequency scaling" -depends on SUPERH +if SUPERH config SH_CPU_FREQ tristate "SuperH CPU Frequency driver" help @@ -293,7 +279,7 @@ config SH_CPU_FREQ For details, take a look at . If unsure, say N. -endmenu +endif endif endmenu