Make /dev/port conditional on config symbol
Instead of having /dev/port support dependent in multiple places on a string of preprocessor symbols, define a new configuration directive for it. This ensures that all four places remain consistent with each other.
Signed-off-by Russell King <[email protected]>
--- drivers/char/Kconfig | 6 ++++++ drivers/char/mem.c | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-)
drivers/char/Kconfig +6 -0
@@ -1038,5 +1038,11 @@ config TELCLOCK /sys/devices/platform/telco_clock, with a number of files for controlling the behavior of this hardware. +config DEVPORT + bool + depends on !M68K + depends on ISA || PCI + default y + endmenu
drivers/char/mem.c +4 -4
@@ -552,7 +552,7 @@ static ssize_t write_kmem(struct file * file, const char __user * buf,return virtr + wrote; } -#if (defined(CONFIG_ISA ) || defined(CONFIG_PCI )) && !defined(__mc68000__) +#ifdef CONFIG_DEVPORT static ssize_t read_port (struct file * file,char __user * buf,size_t count,loff_t *ppos) {
@@ -835,7 +835,7 @@ static const struct file_operations null_fops = { .splice_write = splice_write_null, }; -#if (defined(CONFIG_ISA ) || defined(CONFIG_PCI )) && !defined(__mc68000__) +#ifdef CONFIG_DEVPORT static const struct file_operations port_fops = { .llseek = memory_lseek, .read = read_port,
@@ -913,7 +913,7 @@ static int memory_open(struct inode * inode, struct file * filp)case 3 : filp->f_op = &null_fops;break ; -#if (defined(CONFIG_ISA ) || defined(CONFIG_PCI )) && !defined(__mc68000__) +#ifdef CONFIG_DEVPORT case 4 : filp->f_op = &port_fops;break ;
@@ -960,7 +960,7 @@ static const struct { {1, "mem", S_IRUSR | S_IWUSR | S_IRGRP, &mem_fops}, {2, "kmem", S_IRUSR | S_IWUSR | S_IRGRP, &kmem_fops}, {3, "null", S_IRUGO | S_IWUGO, &null_fops}, -#if (defined(CONFIG_ISA) || defined(CONFIG_PCI)) && !defined(__mc68000__) +#ifdef CONFIG_DEVPORT {4, "port", S_IRUSR | S_IWUSR | S_IRGRP, &port_fops}, #endif {5, "zero", S_IRUGO | S_IWUGO, &zero_fops},
Signature · 3 lines
Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: