From patchwork Tue Mar 12 09:27:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 15279 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 39A3523E39 for ; Tue, 12 Mar 2013 09:28:03 +0000 (UTC) Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com [209.85.128.171]) by fiordland.canonical.com (Postfix) with ESMTP id D70F0A18818 for ; Tue, 12 Mar 2013 09:28:02 +0000 (UTC) Received: by mail-ve0-f171.google.com with SMTP id b10so3310650vea.2 for ; Tue, 12 Mar 2013 02:28:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=mJDGTxvSb+1cg1/Ow33jhrnBK2Yvrn7/DgAA4xQtSFk=; b=HqEkKQAvx1/fMAeWuQ6F4BSSSJW/66s1XfUwd2Qd8ltvgN7cr1MLgrC5uNj9cBQWEf G/a5vhPKSyOm+5yDwurh2W11ZAmFQMJNoG4tcpAjp6g7qOOmVPBNHoex3FWYpwo50w5a XVW6pEKPi1gh2y/PJ4D8Qys0AfhM6xlNJQJhuCiNl6xBNERptucntQViYxMhrXdeSadS SfTVUIPanRvld5ZPSoP8HAB0pjbXHUQ38t28qZHhTGEvRqYbS5EMfVY7+JBhr0z+Kcr1 OrZlYiWb9jk7Z1/nGoEakBtH2v3YuDzRXlUG+AqJKXXmLJ5gEQ/AvjR3IVL4muXXwB85 Y2WA== X-Received: by 10.220.242.73 with SMTP id lh9mr5918648vcb.49.1363080482263; Tue, 12 Mar 2013 02:28:02 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp118255veb; Tue, 12 Mar 2013 02:28:01 -0700 (PDT) X-Received: by 10.180.83.39 with SMTP id n7mr18035161wiy.8.1363080480850; Tue, 12 Mar 2013 02:28:00 -0700 (PDT) Received: from mail-we0-x232.google.com ([2a00:1450:400c:c03::232]) by mx.google.com with ESMTPS id j6si8903716wjn.170.2013.03.12.02.27.59 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Mar 2013 02:28:00 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c03::232 is neither permitted nor denied by best guess record for domain of daniel.lezcano@linaro.org) client-ip=2a00:1450:400c:c03::232; Authentication-Results: mx.google.com; spf=neutral (google.com: 2a00:1450:400c:c03::232 is neither permitted nor denied by best guess record for domain of daniel.lezcano@linaro.org) smtp.mail=daniel.lezcano@linaro.org Received: by mail-we0-f178.google.com with SMTP id o45so4345199wer.23 for ; Tue, 12 Mar 2013 02:27:59 -0700 (PDT) X-Received: by 10.180.97.166 with SMTP id eb6mr17931453wib.20.1363080479119; Tue, 12 Mar 2013 02:27:59 -0700 (PDT) Received: from mai.home (AToulouse-654-1-303-230.w86-199.abo.wanadoo.fr. [86.199.86.230]) by mx.google.com with ESMTPS id fb8sm22742385wid.1.2013.03.12.02.27.56 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Mar 2013 02:27:58 -0700 (PDT) From: Daniel Lezcano To: rjw@sisk.pl Cc: linux-pm@vger.kernel.org, patches@linaro.org, linaro-kernel@lists.linaro.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/2] cpuidle / kirkwood: remove redundant Kconfig option Date: Tue, 12 Mar 2013 10:27:55 +0100 Message-Id: <1363080476-26555-1-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQktC6w5ZP3kGWNdnSNd7NwUckiggEtVweI24z4JI++jUpIa52IEpikFQeuATCRzPoPHvgXJ When the CPU_IDLE and the ARCH_KIRKWOOD options are set it is pointless to define a new option CPU_IDLE_KIRKWOOD because it is redundant. The Makefile drivers directory contains a condition to compile the cpuidle drivers: obj-$(CONFIG_CPU_IDLE) += cpuidle/ Hence, if CPU_IDLE is not set we won't enter this directory. This patch removes the useless Kconfig option and replaces the condition in the Makefile by CONFIG_ARCH_KIRKWOOD. Signed-off-by: Daniel Lezcano --- arch/arm/configs/kirkwood_defconfig | 1 - drivers/cpuidle/Kconfig | 6 ------ drivers/cpuidle/Makefile | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig index 13482ea..93f3794 100644 --- a/arch/arm/configs/kirkwood_defconfig +++ b/arch/arm/configs/kirkwood_defconfig @@ -56,7 +56,6 @@ CONFIG_AEABI=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CPU_IDLE=y -CONFIG_CPU_IDLE_KIRKWOOD=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y diff --git a/drivers/cpuidle/Kconfig b/drivers/cpuidle/Kconfig index 071e2c3..c4cc27e 100644 --- a/drivers/cpuidle/Kconfig +++ b/drivers/cpuidle/Kconfig @@ -39,10 +39,4 @@ config CPU_IDLE_CALXEDA help Select this to enable cpuidle on Calxeda processors. -config CPU_IDLE_KIRKWOOD - bool "CPU Idle Driver for Kirkwood processors" - depends on ARCH_KIRKWOOD - help - Select this to enable cpuidle on Kirkwood processors. - endif diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile index 24c6e7d..0d8bd55 100644 --- a/drivers/cpuidle/Makefile +++ b/drivers/cpuidle/Makefile @@ -6,4 +6,4 @@ obj-y += cpuidle.o driver.o governor.o sysfs.o governors/ obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o -obj-$(CONFIG_CPU_IDLE_KIRKWOOD) += cpuidle-kirkwood.o +obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o