From: Sven Van Asbroeck <thesven73@gmail.com>
To: Oscar Gomez Fuente <oscargomezf@gmail.com>
Cc: Greg KH <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [PATCH v3] staging: fieldbus: core: fix ->poll() annotation
Date: Tue, 21 May 2019 10:20:09 -0400 [thread overview]
Message-ID: <20190521142009.7331-1-TheSven73@gmail.com> (raw)
From: Oscar Gomez Fuente <oscargomezf@gmail.com>
->poll() functions should return __poll_t, but the fieldbus
core's poll() does not. This generates a sparse warning.
Fix the ->poll() return value, and use recommended __poll_t
constants (EPOLLxxx).
Signed-off-by: Oscar Gomez Fuente <oscargomezf@gmail.com>
---
drivers/staging/fieldbus/dev_core.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/fieldbus/dev_core.c b/drivers/staging/fieldbus/dev_core.c
index 60b85140675a..f6f5b92ba914 100644
--- a/drivers/staging/fieldbus/dev_core.c
+++ b/drivers/staging/fieldbus/dev_core.c
@@ -211,16 +211,16 @@ static ssize_t fieldbus_write(struct file *filp, const char __user *buf,
return fbdev->write_area(fbdev, buf, size, offset);
}
-static unsigned int fieldbus_poll(struct file *filp, poll_table *wait)
+static __poll_t fieldbus_poll(struct file *filp, poll_table *wait)
{
struct fb_open_file *of = filp->private_data;
struct fieldbus_dev *fbdev = of->fbdev;
- unsigned int mask = POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM;
+ __poll_t mask = EPOLLIN | EPOLLRDNORM | EPOLLOUT | EPOLLWRNORM;
poll_wait(filp, &fbdev->dc_wq, wait);
/* data changed ? */
if (fbdev->dc_event != of->dc_event)
- mask |= POLLPRI | POLLERR;
+ mask |= EPOLLPRI | EPOLLERR;
return mask;
}
--
2.17.1
next reply other threads:[~2019-05-21 14:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-21 14:20 Sven Van Asbroeck [this message]
2019-05-21 14:24 ` [PATCH v3] staging: fieldbus: core: fix ->poll() annotation Sven Van Asbroeck
2019-05-21 14:37 ` Dan Carpenter
2019-05-21 14:44 ` Sven Van Asbroeck
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=20190521142009.7331-1-TheSven73@gmail.com \
--to=thesven73@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oscargomezf@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.