[poll] annotate SAA6588_CMD_POLL users

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/drivers/media/i2c/saa6588.c b/drivers/media/i2c/saa6588.c
index c3089bd34df252daabc5ef49384f37ff1a2f2e40..33d2987f9555e578c07ac061f1b2136a9a8c88f0 100644 (file)
--- a/drivers/media/i2c/saa6588.c
+++ b/drivers/media/i2c/saa6588.c
@@ -411,9 +411,9 @@ static long saa6588_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg)
                break;
                /* --- poll() for /dev/radio --- */
        case SAA6588_CMD_POLL:
-               a->result = 0;
+               a->poll_mask = 0;
                if (s->data_available_for_read)
-                       a->result |= EPOLLIN | EPOLLRDNORM;
+                       a->poll_mask |= EPOLLIN | EPOLLRDNORM;
                poll_wait(a->instance, &s->read_queue, a->event_list);
                break;
 

diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index f697698fe38ded00117586ada77a8eb7c3a1b13c..707f57a9f9404295210b41e2533dac30d4ee86b4 100644 (file)
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -3344,10 +3344,10 @@ static __poll_t radio_poll(struct file *file, poll_table *wait)
        radio_enable(btv);
        cmd.instance = file;
        cmd.event_list = wait;
-       cmd.result = res;
+       cmd.poll_mask = res;
        bttv_call_all(btv, core, ioctl, SAA6588_CMD_POLL, &cmd);
 
-       return cmd.result;
+       return cmd.poll_mask;
 }
 
 static const struct v4l2_file_operations radio_fops =

diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index 1ca6a32ad10eebdf8269df43b78f37c5ece06c9a..d5a8b24abfbace2cb83098d152270ec9e6184855 100644 (file)
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -1235,12 +1235,12 @@ static __poll_t radio_poll(struct file *file, poll_table *wait)
 
        cmd.instance = file;
        cmd.event_list = wait;
-       cmd.result = 0;
+       cmd.poll_mask = 0;
        mutex_lock(&dev->lock);
        saa_call_all(dev, core, ioctl, SAA6588_CMD_POLL, &cmd);
        mutex_unlock(&dev->lock);
 
-       return rc | cmd.result;
+       return rc | cmd.poll_mask;
 }
 
 /* ------------------------------------------------------------------ */

diff --git a/include/media/i2c/saa6588.h b/include/media/i2c/saa6588.h
index b5ec1aa60ed552337493d63dda4f3fb0382b5e78..a0825f532f712aa377f2e081f50825dd0386b38e 100644 (file)
--- a/include/media/i2c/saa6588.h
+++ b/include/media/i2c/saa6588.h
@@ -32,6 +32,7 @@ struct saa6588_command {
        unsigned char __user *buffer;
        struct file   *instance;
        poll_table    *event_list;
+       __poll_t      poll_mask;
 };
 
 /* These ioctls are internal to the kernel */