Merge tag 'media/v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[sfrench/cifs-2.6.git] / drivers / media / radio / si470x / radio-si470x-common.c

diff --git a/drivers/media/radio/si470x/radio-si470x-common.c b/drivers/media/radio/si470x/radio-si470x-common.c
index c89a7d5b8c55272ecff69d8cb6eb7c6b0f235447..5b477b7d6a66df973d440e9bd4de07e47b858aec 100644 (file)
--- a/drivers/media/radio/si470x/radio-si470x-common.c
+++ b/drivers/media/radio/si470x/radio-si470x-common.c
@@ -33,18 +33,18 @@
  *             - switched from bit structs to bit masks
  *             - header file cleaned and integrated
  * 2008-01-14  Tobias Lorenz <tobias.lorenz@gmx.net>
- *             Version 1.0.2
- *             - hex values are now lower case
- *             - commented USB ID for ADS/Tech moved on todo list
- *             - blacklisted si470x in hid-quirks.c
- *             - rds buffer handling functions integrated into *_work, *_read
- *             - rds_command in si470x_poll exchanged against simple retval
- *             - check for firmware version 15
- *             - code order and prototypes still remain the same
- *             - spacing and bottom of band codes remain the same
+ *             Version 1.0.2
+ *             - hex values are now lower case
+ *             - commented USB ID for ADS/Tech moved on todo list
+ *             - blacklisted si470x in hid-quirks.c
+ *             - rds buffer handling functions integrated into *_work, *_read
+ *             - rds_command in si470x_poll exchanged against simple retval
+ *             - check for firmware version 15
+ *             - code order and prototypes still remain the same
+ *             - spacing and bottom of band codes remain the same
  * 2008-01-16  Tobias Lorenz <tobias.lorenz@gmx.net>
  *             Version 1.0.3
- *             - code reordered to avoid function prototypes
+ *             - code reordered to avoid function prototypes
  *             - switch/case defaults are now more user-friendly
  *             - unified comment style
  *             - applied all checkpatch.pl v1.12 suggestions
@@ -88,8 +88,8 @@
  *             - more safety checks, let si470x_get_freq return errno
  *             - vidioc behavior corrected according to v4l2 spec
  * 2008-10-20  Alexey Klimov <klimov.linux@gmail.com>
- *             - add support for KWorld USB FM Radio FM700
- *             - blacklisted KWorld radio in hid-core.c and hid-ids.h
+ *             - add support for KWorld USB FM Radio FM700
+ *             - blacklisted KWorld radio in hid-core.c and hid-ids.h
  * 2008-12-03  Mark Lord <mlord@pobox.com>
  *             - add support for DealExtreme USB Radio
  * 2009-01-31  Bob Ross <pigiron@gmx.com>
@@ -507,12 +507,12 @@ done:
 /*
  * si470x_fops_poll - poll RDS data
  */
-static unsigned int si470x_fops_poll(struct file *file,
+static __poll_t si470x_fops_poll(struct file *file,
                struct poll_table_struct *pts)
 {
        struct si470x_device *radio = video_drvdata(file);
-       unsigned long req_events = poll_requested_events(pts);
-       int retval = v4l2_ctrl_poll(file, pts);
+       __poll_t req_events = poll_requested_events(pts);
+       __poll_t retval = v4l2_ctrl_poll(file, pts);
 
        if (req_events & (POLLIN | POLLRDNORM)) {
                /* switch on rds reception */