Skip to contentSkip to conversation

Kconfig cleanup (PARPORT_PC dependencies)

PATCH In review Mark Salter 4 participants 20 messages Oct 8, 2013

Subsystems (12)
Arm (32-bit) x86 PowerPC MIPS +8 more subsystems
lore
Share & tools
lore
#0 lore raw

v2 cover Kconfig cleanup (PARPORT_PC dependencies)

This patch series removes the messy dependencies from PARPORT_PC by having it depend on one symbol (ARCH_MAY_HAVE_PC_PARPORT) and having architectures which need it, select ARCH_MAY_HAVE_PC_PARPORT in arch/*/Kconfig.

New architectures are unlikely to need PARPORT_PC, so this avoids having an ever growing list of architectures to exclude. Those architectures which do select ARCH_MAY_HAVE_PC_PARPORT in this patch are the ones which have an asm/parport.h (or use the generic version).

V1 or this patch can be found here:

http://www.spinics.net/lists/linux-arch/msg23167.html

V2 changes:

* Use select instead of adding config option to arch/*/Kconfig
* Split into multiple patches for individual architectures
* Dropped tile architecture

Mark Salter (14):
alpha: select ARCH_MAY_HAVE_PC_PARPORT
arc: select ARCH_MAY_HAVE_PC_PARPORT
arm: select ARCH_MAY_HAVE_PC_PARPORT
ia64: select ARCH_MAY_HAVE_PC_PARPORT
m68k: select ARCH_MAY_HAVE_PC_PARPORT
microblaze: select ARCH_MAY_HAVE_PC_PARPORT
mips: select ARCH_MAY_HAVE_PC_PARPORT
parisc: select ARCH_MAY_HAVE_PC_PARPORT
powerpc: select ARCH_MAY_HAVE_PC_PARPORT
sh: select ARCH_MAY_HAVE_PC_PARPORT
sparc: select ARCH_MAY_HAVE_PC_PARPORT
unicore32: select ARCH_MAY_HAVE_PC_PARPORT
x86: select ARCH_MAY_HAVE_PC_PARPORT
Kconfig cleanup (PARPORT_PC dependencies)

 arch/alpha/Kconfig      |  1 +
 arch/arc/Kconfig        |  1 +
 arch/arm/Kconfig        |  1 +
 arch/ia64/Kconfig       |  1 +
 arch/m68k/Kconfig       |  1 +
 arch/microblaze/Kconfig |  1 +
 arch/mips/Kconfig       |  1 +
 arch/parisc/Kconfig     |  1 +
 arch/powerpc/Kconfig    |  1 +
 arch/sh/Kconfig         |  1 +
 arch/sparc/Kconfig      |  1 +
 arch/unicore32/Kconfig  |  1 +
 arch/x86/Kconfig        |  1 +
 drivers/parport/Kconfig | 10 +++++++---
 14 files changed, 20 insertions(+), 3 deletions(-)
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH v2 1/14 alpha: select ARCH_MAY_HAVE_PC_PARPORT

Architectures which support CONFIG_PARPORT_PC should select ARCH_MAY_HAVE_PC_PARPORT.

---
 arch/alpha/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/alpha/Kconfig +1 -0
index 35a300d..626949c 100644
@@ -1,6 +1,7 @@
 config ALPHA
 	bool
 	default y
+	select ARCH_MAY_HAVE_PC_PARPORT
 	select HAVE_AOUT
 	select HAVE_IDE
 	select HAVE_OPROFILE
Signature · 1 line
1.8.3.1
#2 lore raw

PATCH v2 2/14 arc: select ARCH_MAY_HAVE_PC_PARPORT

In reply to Mark Salter

Architectures which support CONFIG_PARPORT_PC should select ARCH_MAY_HAVE_PC_PARPORT.

---
 arch/arc/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arc/Kconfig +1 -0
index 91dbb27..484b1a7 100644
@@ -8,6 +8,7 @@
 
 config ARC
 	def_bool y
+	select ARCH_MAY_HAVE_PC_PARPORT
 	select CLONE_BACKWARDS
 	# ARC Busybox based initramfs absolutely relies on DEVTMPFS for /dev
 	select DEVTMPFS if !INITRAMFS_SOURCE=""
Signature · 1 line
1.8.3.1
#3 lore raw

Re: [PATCH v2 02/14] arc: select ARCH_MAY_HAVE_PC_PARPORT

Hi Mark,

Quoted 15 lines · Mark Salter

Architectures which support CONFIG_PARPORT_PC should select ARCH_MAY_HAVE_PC_PARPORT.

---
 arch/arc/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arc/Kconfig +0 -0
index 91dbb27..484b1a7 100644

arch/arc/Kconfig line 14

Quoted 7 lines
arch/arc/Kconfig +1 -0
@@ -8,6 +8,7 @@
 
 config ARC
 	def_bool y
+	select ARCH_MAY_HAVE_PC_PARPORT
 	select CLONE_BACKWARDS
 	# ARC Busybox based initramfs absolutely relies on DEVTMPFS for /dev
 	select DEVTMPFS if !INITRAMFS_SOURCE=""

You can drop ARC from the series, we don't care for this deivce.

Thx,
-Vineet

#4 lore raw

PATCH v2 3/14 arm: select ARCH_MAY_HAVE_PC_PARPORT

In reply to Mark Salter

Architectures which support CONFIG_PARPORT_PC should select ARCH_MAY_HAVE_PC_PARPORT.

CC Russell King <[email protected]>
CC linux-arm-kernel at lists.infradead.org
---
 arch/arm/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/Kconfig +1 -0
index 1ad6fb6..2734ec1 100644
@@ -5,6 +5,7 @@ config ARM
 	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
 	select ARCH_HAVE_CUSTOM_GPIO_H
+	select ARCH_MAY_HAVE_PC_PARPORT
 	select ARCH_WANT_IPC_PARSE_VERSION
 	select BUILDTIME_EXTABLE_SORT if MMU
 	select CLONE_BACKWARDS
Signature · 1 line
1.8.3.1
#5 lore raw

PATCH v2 4/14 ia64: select ARCH_MAY_HAVE_PC_PARPORT

In reply to Mark Salter

Architectures which support CONFIG_PARPORT_PC should select ARCH_MAY_HAVE_PC_PARPORT.

---
 arch/ia64/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/ia64/Kconfig +1 -0
index 7740ab1..f88117a 100644
@@ -6,6 +6,7 @@ menu "Processor type and features"
 
 config IA64
 	bool
+	select ARCH_MAY_HAVE_PC_PARPORT
 	select PCI if (!IA64_HP_SIM)
 	select ACPI if (!IA64_HP_SIM)
 	select PM if (!IA64_HP_SIM)
Signature · 1 line
1.8.3.1
#6 lore raw

PATCH v2 5/14 m68k: select ARCH_MAY_HAVE_PC_PARPORT

In reply to Mark Salter

Architectures which support CONFIG_PARPORT_PC should select ARCH_MAY_HAVE_PC_PARPORT.

Acked by: Geert Uytterhoeven <[email protected]>
CC: [email protected]

---
 arch/m68k/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/m68k/Kconfig +1 -0
index 311a300..0d88a0b 100644
@@ -1,6 +1,7 @@
 config M68K
 	bool
 	default y
+	select ARCH_MAY_HAVE_PC_PARPORT if ISA
 	select HAVE_IDE
 	select HAVE_AOUT if MMU
 	select HAVE_DEBUG_BUGVERBOSE
Signature · 1 line
1.8.3.1
#7 lore raw

PATCH v2 6/14 microblaze: select ARCH_MAY_HAVE_PC_PARPORT

In reply to Mark Salter

Architectures which support CONFIG_PARPORT_PC should select ARCH_MAY_HAVE_PC_PARPORT.

---
 arch/microblaze/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/microblaze/Kconfig +1 -0
index b82f82b..19caa61 100644
@@ -1,5 +1,6 @@
 config MICROBLAZE
 	def_bool y
+	select ARCH_MAY_HAVE_PC_PARPORT
 	select HAVE_MEMBLOCK
 	select HAVE_MEMBLOCK_NODE_MAP
 	select HAVE_FUNCTION_TRACER
Signature · 1 line
1.8.3.1
#8 lore raw

PATCH v2 7/14 mips: select ARCH_MAY_HAVE_PC_PARPORT

In reply to Mark Salter

Architectures which support CONFIG_PARPORT_PC should select ARCH_MAY_HAVE_PC_PARPORT.

---
 arch/mips/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/mips/Kconfig +1 -0
index f75ab4a..199fde67 100644
@@ -1,6 +1,7 @@
 config MIPS
 	bool
 	default y
+	select ARCH_MAY_HAVE_PC_PARPORT
 	select HAVE_CONTEXT_TRACKING
 	select HAVE_GENERIC_DMA_COHERENT
 	select HAVE_IDE
Signature · 1 line
1.8.3.1
Acked-by on v2 7/14
#9 lore raw

Re: [PATCH v2 07/14] mips: select ARCH_MAY_HAVE_PC_PARPORT

Quoted 2 lines · Mark Salter

Architectures which support CONFIG_PARPORT_PC should select ARCH_MAY_HAVE_PC_PARPORT.

Ralf

#10 lore raw

PATCH v2 8/14 parisc: select ARCH_MAY_HAVE_PC_PARPORT

In reply to Mark Salter

Architectures which support CONFIG_PARPORT_PC should select ARCH_MAY_HAVE_PC_PARPORT.

CC "James E.J. Bottomley" <[email protected]>
CC Helge Deller <[email protected]>
---
 arch/parisc/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/parisc/Kconfig +1 -0
index ad2ce8d..9af24ac 100644
@@ -1,6 +1,7 @@
 config PARISC
 	def_bool y
 	select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
+	select ARCH_MAY_HAVE_PC_PARPORT
 	select HAVE_IDE
 	select HAVE_OPROFILE
 	select HAVE_FUNCTION_TRACER if 64BIT
Signature · 1 line
1.8.3.1
#11 lore raw

PATCH v2 9/14 powerpc: select ARCH_MAY_HAVE_PC_PARPORT

In reply to Mark Salter

Architectures which support CONFIG_PARPORT_PC should select ARCH_MAY_HAVE_PC_PARPORT.

CC Benjamin Herrenschmidt <[email protected]>
CC Paul Mackerras <[email protected]>
---
 arch/powerpc/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/powerpc/Kconfig +1 -0
index 38f3b7e..9211207 100644
@@ -85,6 +85,7 @@ config GENERIC_HWEIGHT
 config PPC
 	bool
 	default y
+	select ARCH_MAY_HAVE_PC_PARPORT
 	select BINFMT_ELF
 	select OF
 	select OF_EARLY_FLATTREE
Signature · 1 line
1.8.3.1
#12 lore raw

PATCH v2 10/14 sh: select ARCH_MAY_HAVE_PC_PARPORT

In reply to Mark Salter

Architectures which support CONFIG_PARPORT_PC should select ARCH_MAY_HAVE_PC_PARPORT.

---
 arch/sh/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/sh/Kconfig +1 -0
index 224f4bc..a5d1d2e 100644
@@ -1,5 +1,6 @@
 config SUPERH
 	def_bool y
+	select ARCH_MAY_HAVE_PC_PARPORT
 	select EXPERT
 	select CLKDEV_LOOKUP
 	select HAVE_IDE if HAS_IOPORT
Signature · 1 line
1.8.3.1
#13 lore raw

PATCH v2 11/14 sparc: select ARCH_MAY_HAVE_PC_PARPORT

In reply to Mark Salter

Architectures which support CONFIG_PARPORT_PC should select ARCH_MAY_HAVE_PC_PARPORT.

---
 arch/sparc/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/sparc/Kconfig +1 -0
index 78c4fdb..362229a 100644
@@ -12,6 +12,7 @@ config 64BIT
 config SPARC
 	bool
 	default y
+	select ARCH_MAY_HAVE_PC_PARPORT if SPARC64 && PCI
 	select OF
 	select OF_PROMTREE
 	select HAVE_IDE
Signature · 1 line
1.8.3.1
#14 lore raw

PATCH v2 12/14 unicore32: select ARCH_MAY_HAVE_PC_PARPORT

In reply to Mark Salter

Architectures which support CONFIG_PARPORT_PC should select ARCH_MAY_HAVE_PC_PARPORT.

---
 arch/unicore32/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/unicore32/Kconfig +1 -0
index 82cdd89..9e0b8bd 100644
@@ -1,5 +1,6 @@
 config UNICORE32
 	def_bool y
+	select ARCH_MAY_HAVE_PC_PARPORT
 	select HAVE_MEMBLOCK
 	select HAVE_GENERIC_DMA_COHERENT
 	select HAVE_DMA_ATTRS
Signature · 1 line
1.8.3.1
#15 lore raw

PATCH v2 13/14 x86: select ARCH_MAY_HAVE_PC_PARPORT

In reply to Mark Salter

Architectures which support CONFIG_PARPORT_PC should select ARCH_MAY_HAVE_PC_PARPORT.

CC Thomas Gleixner <[email protected]>
CC Ingo Molnar <[email protected]>
CC "H. Peter Anvin" <[email protected]>
---
 arch/x86/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/x86/Kconfig +1 -0
index ee2fb9d..72fca40 100644
@@ -22,6 +22,7 @@ config X86_64
 config X86
 	def_bool y
 	select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
+	select ARCH_MAY_HAVE_PC_PARPORT
 	select HAVE_AOUT if X86_32
 	select HAVE_UNSTABLE_SCHED_CLOCK
 	select ARCH_SUPPORTS_NUMA_BALANCING
Signature · 1 line
1.8.3.1
Acked-by on v2 13/14
#16 lore raw

Re: [PATCH v2 13/14] x86: select ARCH_MAY_HAVE_PC_PARPORT

Quoted 17 lines · Mark Salter

Architectures which support CONFIG_PARPORT_PC should select ARCH_MAY_HAVE_PC_PARPORT.

CC Thomas Gleixner <[email protected]>
CC Ingo Molnar <[email protected]>
CC "H. Peter Anvin" <[email protected]>
---
 arch/x86/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/x86/Kconfig +0 -0
index ee2fb9d..72fca40 100644

arch/x86/Kconfig config X86_64 · line 28

Quoted 7 lines
arch/x86/Kconfig +1 -0
@@ -22,6 +22,7 @@ config X86_64
 config X86
 	def_bool y
 	select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
+	select ARCH_MAY_HAVE_PC_PARPORT
 	select HAVE_AOUT if X86_32
 	select HAVE_UNSTABLE_SCHED_CLOCK
 	select ARCH_SUPPORTS_NUMA_BALANCING

Thanks,

Ingo

#17 lore raw

PATCH v2 14/14 Kconfig cleanup (PARPORT_PC dependencies)

In reply to Mark Salter

Remove messy dependencies from PARPORT_PC by having it depend on one Kconfig symbol (ARCH_MAY_HAVE_PC_PARPORT) and having architectures which need it, select ARCH_MAY_HAVE_PC_PARPORT in arch/*/Kconfig. New architectures are unlikely to need PARPORT_PC, so this avoids having an ever growing list of architectures to exclude. Those architectures which do select ARCH_MAY_HAVE_PC_PARPORT in this patch are the ones which have an asm/parport.h (or use the generic version).

CC Richard Henderson <[email protected]>
CC Vineet Gupta <[email protected]>
CC Russell King <[email protected]>
CC Tony Luck <[email protected]>
CC Fenghua Yu <[email protected]>
CC Geert Uytterhoeven <[email protected]>
CC Michal Simek <[email protected]>
CC Ralf Baechle <[email protected]>
CC "James E.J. Bottomley" <[email protected]>
CC Helge Deller <[email protected]>
CC Benjamin Herrenschmidt <[email protected]>
CC Paul Mackerras <[email protected]>
CC Paul Mundt <[email protected]>
CC "David S. Miller" <[email protected]>
CC Guan Xuetao <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Ingo Molnar <[email protected]>
CC "H. Peter Anvin" <[email protected]>
---
 drivers/parport/Kconfig | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/parport/Kconfig +7 -3
index 70694ce..a079b18 100644
@@ -31,13 +31,17 @@ menuconfig PARPORT
 
 	  If unsure, say Y.
 
+config ARCH_MAY_HAVE_PC_PARPORT
+	bool
+	help
+	  Select this config option from the architecture Kconfig if
+	  the architecture may have PC parallel port hardware.
+
 if PARPORT
 
 config PARPORT_PC
 	tristate "PC-style hardware"
-	depends on (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV && !S390 && \
-		(!M68K || ISA) && !MN10300 && !AVR32 && !BLACKFIN && \
-		!XTENSA && !CRIS && !H8300
+	depends on ARCH_MAY_HAVE_PC_PARPORT
 
 	---help---
 	  You should say Y here if you have a PC-style parallel port. All
Signature · 1 line
1.8.3.1
Acked-by on v2 14/14
#18 lore raw
Quoted 58 lines · Mark Salter

Remove messy dependencies from PARPORT_PC by having it depend on one Kconfig symbol (ARCH_MAY_HAVE_PC_PARPORT) and having architectures which need it, select ARCH_MAY_HAVE_PC_PARPORT in arch/*/Kconfig. New architectures are unlikely to need PARPORT_PC, so this avoids having an ever growing list of architectures to exclude. Those architectures which do select ARCH_MAY_HAVE_PC_PARPORT in this patch are the ones which have an asm/parport.h (or use the generic version).

CC Richard Henderson <[email protected]>
CC Vineet Gupta <[email protected]>
CC Russell King <[email protected]>
CC Tony Luck <[email protected]>
CC Fenghua Yu <[email protected]>
CC Geert Uytterhoeven <[email protected]>
CC Michal Simek <[email protected]>
CC Ralf Baechle <[email protected]>
CC "James E.J. Bottomley" <[email protected]>
CC Helge Deller <[email protected]>
CC Benjamin Herrenschmidt <[email protected]>
CC Paul Mackerras <[email protected]>
CC Paul Mundt <[email protected]>
CC "David S. Miller" <[email protected]>
CC Guan Xuetao <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Ingo Molnar <[email protected]>
CC "H. Peter Anvin" <[email protected]>
---
 drivers/parport/Kconfig | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/parport/Kconfig +6 -0
index 70694ce..a079b18 100644
@@ -31,13 +31,17 @@ menuconfig PARPORT
 
 	  If unsure, say Y.
 
+config ARCH_MAY_HAVE_PC_PARPORT
+	bool
+	help
+	  Select this config option from the architecture Kconfig if
+	  the architecture may have PC parallel port hardware.
+
 if PARPORT

drivers/parport/Kconfig menuconfig PARPORT · line 47

Quoted 10 lines
drivers/parport/Kconfig +1 -3
 
 config PARPORT_PC
 	tristate "PC-style hardware"
-	depends on (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV && !S390 && \
-		(!M68K || ISA) && !MN10300 && !AVR32 && !BLACKFIN && \
-		!XTENSA && !CRIS && !H8300
+	depends on ARCH_MAY_HAVE_PC_PARPORT
 
 	---help---
 	  You should say Y here if you have a PC-style parallel port. All

Since it's not a permission to have a parallel port but a possibility, I suspect the whole series needs a:

s/MAY_HAVE/MIGHT_HAVE
s/may have/might have

Otherwise:

Thanks,

Ingo

Acked-by on v2 14/14
#19 lore raw
In reply to Mark Salter
Quoted 8 lines · Mark Salter

Remove messy dependencies from PARPORT_PC by having it depend on one Kconfig symbol (ARCH_MAY_HAVE_PC_PARPORT) and having architectures which need it, select ARCH_MAY_HAVE_PC_PARPORT in arch/*/Kconfig. New architectures are unlikely to need PARPORT_PC, so this avoids having an ever growing list of architectures to exclude. Those architectures which do select ARCH_MAY_HAVE_PC_PARPORT in this patch are the ones which have an asm/parport.h (or use the generic version).

Ralf