summaryrefslogtreecommitdiffstats
path: root/drivers/char/mem.c
diff options
context:
space:
mode:
authorRob Ward <robert.ward114@googlemail.com>2014-12-07 15:40:35 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-01-12 05:04:11 -0800
commit3a4bc2fb80fb1fc943b640aae87dc078ba2aad78 (patch)
treeb1e8015a899a8d5179f3e8aeaa446dad8c15094c /drivers/char/mem.c
parenta8c912522b547b3512cd25ccb8d507cd75264c84 (diff)
downloadlinux-3a4bc2fb80fb1fc943b640aae87dc078ba2aad78.tar.bz2
drivers: char: mem: Simplify DEVPORT configuration
Simplify the use of CONFIG_DEVPORT by making the port_fops so that it includes __maybe_unused. This enabled the multiple #ifdef's used for this structure to be removed and brings it in line with the use of CONFIG_DEVMEM This change should introduce no functional changes. Signed-off-by: Rob Ward <robert.ward114@googlemail.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char/mem.c')
-rw-r--r--drivers/char/mem.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 17b21396e7f9..40c1580ecd47 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -542,7 +542,6 @@ static ssize_t write_kmem(struct file *file, const char __user *buf,
return virtr + wrote ? : err;
}
-#ifdef CONFIG_DEVPORT
static ssize_t read_port(struct file *file, char __user *buf,
size_t count, loff_t *ppos)
{
@@ -583,7 +582,6 @@ static ssize_t write_port(struct file *file, const char __user *buf,
*ppos = i;
return tmp-buf;
}
-#endif
static ssize_t read_null(struct file *file, char __user *buf,
size_t count, loff_t *ppos)
@@ -738,14 +736,12 @@ static const struct file_operations null_fops = {
.splice_write = splice_write_null,
};
-#ifdef CONFIG_DEVPORT
-static const struct file_operations port_fops = {
+static const struct file_operations __maybe_unused port_fops = {
.llseek = memory_lseek,
.read = read_port,
.write = write_port,
.open = open_port,
};
-#endif
static const struct file_operations zero_fops = {
.llseek = zero_lseek,