From: robert.ward114@googlemail.com
To: arnd@arndb.de, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org
Cc: Rob Ward <robert.ward114@googlemail.com>
Subject: [PATCH 3/3] drivers: char: mem: Simplify DEVPORT configuration
Date: Sun, 7 Dec 2014 15:40:35 +0000 [thread overview]
Message-ID: <1417966835-14012-4-git-send-email-robert.ward114@googlemail.com> (raw)
In-Reply-To: <1417966835-14012-1-git-send-email-robert.ward114@googlemail.com>
From: Rob Ward <robert.ward114@googlemail.com>
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>
---
drivers/char/mem.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 4521fea..39315fe 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -539,7 +539,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)
{
@@ -580,7 +579,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)
@@ -735,14 +733,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,
--
2.0.2
next prev parent reply other threads:[~2014-12-07 15:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-07 15:40 [PATCH 0/3] /dev/mem as optional device + associated tidy up robert.ward114
2014-12-07 15:40 ` [PATCH 1/3] drivers: char: mem: Make /dev/mem an optional device robert.ward114
2014-12-07 15:40 ` [PATCH 2/3] drivers: char: mem: Simplify DEVKMEM configuration robert.ward114
2014-12-07 15:40 ` robert.ward114 [this message]
2014-12-07 19:35 ` [PATCH 0/3] /dev/mem as optional device + associated tidy up Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1417966835-14012-4-git-send-email-robert.ward114@googlemail.com \
--to=robert.ward114@googlemail.com \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox