[PATCH] staging: fieldbus: solve warning incorrect type dev_core.c

[PATCH] staging: fieldbus: solve warning incorrect type dev_core.c

[Oscar Gomez Fuente]

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 60b851406..f6f5b92 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.7.4

Re: [PATCH] staging: fieldbus: solve warning incorrect type dev_core.c

[Greg KH]

On Fri, May 17, 2019 at 06:53:11PM +0200, Oscar Gomez Fuente wrote:
> Signed-off-by: Oscar Gomez Fuente <oscargomezf@gmail.com>
> ---
>  drivers/staging/fieldbus/dev_core.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

I don't take patches without any changelog text, sorry.

Please fix and resend.

thanks,

greg k-h

[PATCH] staging: fieldbus: solve warning incorrect type dev_core.c

[Oscar Gomez Fuente]

These changes solve a warning realated to an incorrect type inilizer in the function
fieldbus_poll.

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 60b851406..f6f5b92 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.7.4

Re: [PATCH] staging: fieldbus: solve warning incorrect type dev_core.c

[Sven Van Asbroeck]

Hi Oscar, thank you for your contribution! I have a question, see inline.

On Fri, May 17, 2019 at 1:50 PM Oscar Gomez Fuente
<oscargomezf@gmail.com> wrote:
>
> These changes solve a warning realated to an incorrect type inilizer in the function
> fieldbus_poll.
>

Where is this warning generated? Could you provide some brief instructions on
how to reproduce this warning?

Thanks,
Sven

Re: [PATCH] staging: fieldbus: solve warning incorrect type dev_core.c

[Sven Van Asbroeck]

On Mon, May 20, 2019 at 2:35 PM Sven Van Asbroeck <thesven73@gmail.com> wrote:
>
> Hi Oscar, thank you for your contribution! I have a question, see inline.
>
> On Fri, May 17, 2019 at 1:50 PM Oscar Gomez Fuente
> <oscargomezf@gmail.com> wrote:
> >
> > These changes solve a warning realated to an incorrect type inilizer in the function
> > fieldbus_poll.
> >

This warning was generated by sparse, right?

$ make C=2 drivers/staging/fieldbus/
<snip>
  CHECK   drivers/staging/fieldbus/dev_core.c
drivers/staging/fieldbus/dev_core.c:232:27: warning: incorrect type in
initializer (different base types)
drivers/staging/fieldbus/dev_core.c:232:27:    expected restricted
__poll_t ( *poll )( ... )
drivers/staging/fieldbus/dev_core.c:232:27:    got unsigned int (
*<noident> )( ... )
<snip>

I will test your patch on actual h/w, probably tomorrow.
I don't expect to see any problems.

Sven

Re: [PATCH] staging: fieldbus: solve warning incorrect type dev_core.c

[Oscar Gomez Fuente]

Hi Sven,

Yes.

Oscar Gomez Fuente


Óscar Gómez Fuente
Electronic Engineer & Degree in Physical Sciences
Mobile: 659.28.97.90
Email: oscargomezf@gmail.com
Website: www.oscargomezf.com



On Mon, 20 May 2019 at 21:39, Sven Van Asbroeck <thesven73@gmail.com> wrote:
>
> On Mon, May 20, 2019 at 2:35 PM Sven Van Asbroeck <thesven73@gmail.com> wrote:
> >
> > Hi Oscar, thank you for your contribution! I have a question, see inline.
> >
> > On Fri, May 17, 2019 at 1:50 PM Oscar Gomez Fuente
> > <oscargomezf@gmail.com> wrote:
> > >
> > > These changes solve a warning realated to an incorrect type inilizer in the function
> > > fieldbus_poll.
> > >
>
> This warning was generated by sparse, right?
>
> $ make C=2 drivers/staging/fieldbus/
> <snip>
>   CHECK   drivers/staging/fieldbus/dev_core.c
> drivers/staging/fieldbus/dev_core.c:232:27: warning: incorrect type in
> initializer (different base types)
> drivers/staging/fieldbus/dev_core.c:232:27:    expected restricted
> __poll_t ( *poll )( ... )
> drivers/staging/fieldbus/dev_core.c:232:27:    got unsigned int (
> *<noident> )( ... )
> <snip>
>
> I will test your patch on actual h/w, probably tomorrow.
> I don't expect to see any problems.
>
> Sven

Re: [PATCH] staging: fieldbus: solve warning incorrect type dev_core.c

[Sven Van Asbroeck]

On Fri, May 17, 2019 at 1:50 PM Oscar Gomez Fuente
<oscargomezf@gmail.com> wrote:
>
> These changes solve a warning realated to an incorrect type inilizer in the function
> fieldbus_poll.
>
> Signed-off-by: Oscar Gomez Fuente <oscargomezf@gmail.com>
> ---

I've reviewed your patch and tested it on a live system. Everything looks good.
However, I believe that your commit message could be improved.

I am going to re-post this patch as v3 (keeping you as the author) but with
a (hopefully) improved commit message. If you provide positive feedback,
and nobody else has any comments, I will tag it with my Reviewed-by,
which will hopefully be Greg's cue to take the patch.

In the future you could perhaps run your patch through ./scripts/checkpatch.pl
before you post it? This should pick up missing commit messages, lines in the
commit msg that are too long, etc.

Re: [PATCH] staging: fieldbus: solve warning incorrect type dev_core.c

[Greg KH]

On Tue, May 21, 2019 at 10:13:58AM -0400, Sven Van Asbroeck wrote:
> On Fri, May 17, 2019 at 1:50 PM Oscar Gomez Fuente
> <oscargomezf@gmail.com> wrote:
> >
> > These changes solve a warning realated to an incorrect type inilizer in the function
> > fieldbus_poll.
> >
> > Signed-off-by: Oscar Gomez Fuente <oscargomezf@gmail.com>
> > ---
> 
> I've reviewed your patch and tested it on a live system. Everything looks good.
> However, I believe that your commit message could be improved.
> 
> I am going to re-post this patch as v3 (keeping you as the author) but with
> a (hopefully) improved commit message. If you provide positive feedback,
> and nobody else has any comments, I will tag it with my Reviewed-by,
> which will hopefully be Greg's cue to take the patch.

Greg already took this patch a while ago :)

thanks,

greg k-h

Re: [PATCH] staging: fieldbus: solve warning incorrect type dev_core.c

[Sven Van Asbroeck]

On Tue, May 21, 2019 at 10:17 AM Greg KH <gregkh@linuxfoundation.org> wrote:
>
>
> Greg already took this patch a while ago :)
>

Thanks for bringing that up Greg, I'll double-check your tree next time.

Oscar, please ignore the v3 patch I posted.

Sven

Re: [PATCH] staging: fieldbus: solve warning incorrect type dev_core.c

[Oscar Gomez Fuente]

Ok, perfect!

Oscar Gomez Fuente