diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2017-07-03 06:39:46 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-11-28 11:06:58 -0500 |
commit | afc9a42b7464f76e1388cad87d8543c69f6f74ed (patch) | |
tree | abc3abe50053edd3dcf0b04c2d2a63640ee89f6b /drivers/rpmsg | |
parent | c23e0cb81e4021b9712b1093d54713991fd9b7c2 (diff) |
the rest of drivers/*: annotate ->poll() instances
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/rpmsg')
-rw-r--r-- | drivers/rpmsg/qcom_smd.c | 4 | ||||
-rw-r--r-- | drivers/rpmsg/rpmsg_char.c | 4 | ||||
-rw-r--r-- | drivers/rpmsg/rpmsg_core.c | 2 | ||||
-rw-r--r-- | drivers/rpmsg/rpmsg_internal.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/rpmsg/qcom_smd.c b/drivers/rpmsg/qcom_smd.c index b01774e9fac0..e540ca362d08 100644 --- a/drivers/rpmsg/qcom_smd.c +++ b/drivers/rpmsg/qcom_smd.c | |||
@@ -919,12 +919,12 @@ static int qcom_smd_trysend(struct rpmsg_endpoint *ept, void *data, int len) | |||
919 | return __qcom_smd_send(qsept->qsch, data, len, false); | 919 | return __qcom_smd_send(qsept->qsch, data, len, false); |
920 | } | 920 | } |
921 | 921 | ||
922 | static unsigned int qcom_smd_poll(struct rpmsg_endpoint *ept, | 922 | static __poll_t qcom_smd_poll(struct rpmsg_endpoint *ept, |
923 | struct file *filp, poll_table *wait) | 923 | struct file *filp, poll_table *wait) |
924 | { | 924 | { |
925 | struct qcom_smd_endpoint *qsept = to_smd_endpoint(ept); | 925 | struct qcom_smd_endpoint *qsept = to_smd_endpoint(ept); |
926 | struct qcom_smd_channel *channel = qsept->qsch; | 926 | struct qcom_smd_channel *channel = qsept->qsch; |
927 | unsigned int mask = 0; | 927 | __poll_t mask = 0; |
928 | 928 | ||
929 | poll_wait(filp, &channel->fblockread_event, wait); | 929 | poll_wait(filp, &channel->fblockread_event, wait); |
930 | 930 | ||
diff --git a/drivers/rpmsg/rpmsg_char.c b/drivers/rpmsg/rpmsg_char.c index e0996fce3963..e622fcda30fa 100644 --- a/drivers/rpmsg/rpmsg_char.c +++ b/drivers/rpmsg/rpmsg_char.c | |||
@@ -256,10 +256,10 @@ free_kbuf: | |||
256 | return ret < 0 ? ret : len; | 256 | return ret < 0 ? ret : len; |
257 | } | 257 | } |
258 | 258 | ||
259 | static unsigned int rpmsg_eptdev_poll(struct file *filp, poll_table *wait) | 259 | static __poll_t rpmsg_eptdev_poll(struct file *filp, poll_table *wait) |
260 | { | 260 | { |
261 | struct rpmsg_eptdev *eptdev = filp->private_data; | 261 | struct rpmsg_eptdev *eptdev = filp->private_data; |
262 | unsigned int mask = 0; | 262 | __poll_t mask = 0; |
263 | 263 | ||
264 | if (!eptdev->ept) | 264 | if (!eptdev->ept) |
265 | return POLLERR; | 265 | return POLLERR; |
diff --git a/drivers/rpmsg/rpmsg_core.c b/drivers/rpmsg/rpmsg_core.c index dffa3aab7178..5a081762afcc 100644 --- a/drivers/rpmsg/rpmsg_core.c +++ b/drivers/rpmsg/rpmsg_core.c | |||
@@ -247,7 +247,7 @@ EXPORT_SYMBOL(rpmsg_trysendto); | |||
247 | * | 247 | * |
248 | * Returns mask representing the current state of the endpoint's send buffers | 248 | * Returns mask representing the current state of the endpoint's send buffers |
249 | */ | 249 | */ |
250 | unsigned int rpmsg_poll(struct rpmsg_endpoint *ept, struct file *filp, | 250 | __poll_t rpmsg_poll(struct rpmsg_endpoint *ept, struct file *filp, |
251 | poll_table *wait) | 251 | poll_table *wait) |
252 | { | 252 | { |
253 | if (WARN_ON(!ept)) | 253 | if (WARN_ON(!ept)) |
diff --git a/drivers/rpmsg/rpmsg_internal.h b/drivers/rpmsg/rpmsg_internal.h index 0cf9c7e2ee83..685aa70e9cbe 100644 --- a/drivers/rpmsg/rpmsg_internal.h +++ b/drivers/rpmsg/rpmsg_internal.h | |||
@@ -71,7 +71,7 @@ struct rpmsg_endpoint_ops { | |||
71 | int (*trysendto)(struct rpmsg_endpoint *ept, void *data, int len, u32 dst); | 71 | int (*trysendto)(struct rpmsg_endpoint *ept, void *data, int len, u32 dst); |
72 | int (*trysend_offchannel)(struct rpmsg_endpoint *ept, u32 src, u32 dst, | 72 | int (*trysend_offchannel)(struct rpmsg_endpoint *ept, u32 src, u32 dst, |
73 | void *data, int len); | 73 | void *data, int len); |
74 | unsigned int (*poll)(struct rpmsg_endpoint *ept, struct file *filp, | 74 | __poll_t (*poll)(struct rpmsg_endpoint *ept, struct file *filp, |
75 | poll_table *wait); | 75 | poll_table *wait); |
76 | }; | 76 | }; |
77 | 77 | ||