leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make /dev/port conditional on config symbol

Browse Source 
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 <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Russell King 2007-05-08 00:28:17 -07:00 committed by Linus Torvalds
parent 62456726d7
commit 4f911d64e0
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/char/Kconfig
View File

@ -1071,5 +1071,11 @@ config TELCLOCK
/sys/devices/platform/telco_clock, with a number of files for /sys/devices/platform/telco_clock, with a number of files for
controlling the behavior of this hardware. controlling the behavior of this hardware.
config DEVPORT
bool
depends on !M68K
depends on ISA || PCI
default y
endmenu endmenu

8
drivers/char/mem.c
View File

@ -551,7 +551,7 @@ static ssize_t write_kmem(struct file * file, const char __user * buf,
return virtr + wrote; 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, static ssize_t read_port(struct file * file, char __user * buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
@ -834,7 +834,7 @@ static const struct file_operations null_fops = {
.splice_write = splice_write_null, .splice_write = splice_write_null,
}; };
#if (defined(CONFIG_ISA) || defined(CONFIG_PCI)) && !defined(__mc68000__) #ifdef CONFIG_DEVPORT
static const struct file_operations port_fops = { static const struct file_operations port_fops = {
.llseek = memory_lseek, .llseek = memory_lseek,
.read = read_port, .read = read_port,
@ -912,7 +912,7 @@ static int memory_open(struct inode * inode, struct file * filp)
case 3: case 3:
filp->f_op = &null_fops; filp->f_op = &null_fops;
break; break;
#if (defined(CONFIG_ISA) || defined(CONFIG_PCI)) && !defined(__mc68000__) #ifdef CONFIG_DEVPORT
case 4: case 4:
filp->f_op = &port_fops; filp->f_op = &port_fops;
break; break;
@ -959,7 +959,7 @@ static const struct {
{1, "mem", S_IRUSR | S_IWUSR | S_IRGRP, &mem_fops}, {1, "mem", S_IRUSR | S_IWUSR | S_IRGRP, &mem_fops},
{2, "kmem", S_IRUSR | S_IWUSR | S_IRGRP, &kmem_fops}, {2, "kmem", S_IRUSR | S_IWUSR | S_IRGRP, &kmem_fops},
{3, "null", S_IRUGO | S_IWUGO, &null_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}, {4, "port", S_IRUSR | S_IWUSR | S_IRGRP, &port_fops},
#endif #endif
{5, "zero", S_IRUGO | S_IWUGO, &zero_fops}, {5, "zero", S_IRUGO | S_IWUGO, &zero_fops},