[PATCH v3] staging: fieldbus: core: fix ->poll() annotation

[PATCH v3] staging: fieldbus: core: fix ->poll() annotation

[Sven Van Asbroeck]

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

Re: [PATCH v3] staging: fieldbus: core: fix ->poll() annotation

[Sven Van Asbroeck]

On Tue, May 21, 2019 at 10:20 AM Sven Van Asbroeck <thesven73@gmail.com> wrote:
>
> 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>

Please ignore this patch.
> /dev/null :)

Re: [PATCH v3] staging: fieldbus: core: fix ->poll() annotation

[Dan Carpenter]

On Tue, May 21, 2019 at 10:20:09AM -0400, Sven Van Asbroeck wrote:
> 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>
> ---

If you're resending someone's patch, you have to add your own Signed off
by line as well.  Everyone who touches a patch has to sign that they
didn't add any of SCO's all powerful UnixWare source code into the
patch.

regards,
dan carpenter

Re: [PATCH v3] staging: fieldbus: core: fix ->poll() annotation

[Sven Van Asbroeck]

On Tue, May 21, 2019 at 10:37 AM Dan Carpenter <dan.carpenter@oracle.com> wrote:
>
>
> If you're resending someone's patch, you have to add your own Signed off
> by line as well.  Everyone who touches a patch has to sign that they
> didn't add any of SCO's all powerful UnixWare source code into the
> patch.
>

Thank you Dan, that's very useful to know !

Sven