Merge tag 'rpmsg-v4.16' of git://github.com/andersson/remoteproc

[linux-2.6-microblaze.git] / drivers / rpmsg / qcom_smd.c

diff --git a/drivers/rpmsg/qcom_smd.c b/drivers/rpmsg/qcom_smd.c
index e92fd01..8428eba 100644 (file)
--- a/drivers/rpmsg/qcom_smd.c
+++ b/drivers/rpmsg/qcom_smd.c
@@ -957,12 +957,12 @@ static int qcom_smd_trysend(struct rpmsg_endpoint *ept, void *data, int len)
        return __qcom_smd_send(qsept->qsch, data, len, false);
 }
 
-static unsigned int qcom_smd_poll(struct rpmsg_endpoint *ept,
+static __poll_t qcom_smd_poll(struct rpmsg_endpoint *ept,
                                  struct file *filp, poll_table *wait)
 {
        struct qcom_smd_endpoint *qsept = to_smd_endpoint(ept);
        struct qcom_smd_channel *channel = qsept->qsch;
-       unsigned int mask = 0;
+       __poll_t mask = 0;
 
        poll_wait(filp, &channel->fblockread_event, wait);