openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ppc: annotate ->poll() instances 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2017-07-02 22:33:19 -04:00
parent 8b9aab09aa
commit 8153a5ead0
6 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/kernel/rtasd.c
View File

@ -388,7 +388,7 @@ static ssize_t rtas_log_read(struct file * file, char __user * buf,
return error;
}
static unsigned int rtas_log_poll(struct file *file, poll_table * wait)
static __poll_t rtas_log_poll(struct file *file, poll_table * wait)
{
poll_wait(file, &rtas_log_wait, wait);
if (rtas_log_size)

6
arch/powerpc/platforms/cell/spufs/backing_ops.c
View File

@ -86,10 +86,10 @@ static u32 spu_backing_mbox_stat_read(struct spu_context *ctx)
return ctx->csa.prob.mb_stat_R;
}
static unsigned int spu_backing_mbox_stat_poll(struct spu_context *ctx,
unsigned int events)
static __poll_t spu_backing_mbox_stat_poll(struct spu_context *ctx,
__poll_t events)
{
int ret;
__poll_t ret;
u32 stat;
ret = 0;

16
arch/powerpc/platforms/cell/spufs/file.c
View File

@ -762,10 +762,10 @@ static ssize_t spufs_ibox_read(struct file *file, char __user *buf,
return count;
}
static unsigned int spufs_ibox_poll(struct file *file, poll_table *wait)
static __poll_t spufs_ibox_poll(struct file *file, poll_table *wait)
{
struct spu_context *ctx = file->private_data;
unsigned int mask;
__poll_t mask;
poll_wait(file, &ctx->ibox_wq, wait);
@ -898,10 +898,10 @@ static ssize_t spufs_wbox_write(struct file *file, const char __user *buf,
return count;
}
static unsigned int spufs_wbox_poll(struct file *file, poll_table *wait)
static __poll_t spufs_wbox_poll(struct file *file, poll_table *wait)
{
struct spu_context *ctx = file->private_data;
unsigned int mask;
__poll_t mask;
poll_wait(file, &ctx->wbox_wq, wait);
@ -1690,11 +1690,11 @@ static ssize_t spufs_mfc_write(struct file *file, const char __user *buffer,
return ret;
}
static unsigned int spufs_mfc_poll(struct file *file,poll_table *wait)
static __poll_t spufs_mfc_poll(struct file *file,poll_table *wait)
{
struct spu_context *ctx = file->private_data;
u32 free_elements, tagstatus;
unsigned int mask;
__poll_t mask;
poll_wait(file, &ctx->mfc_wq, wait);
@ -2455,11 +2455,11 @@ static ssize_t spufs_switch_log_read(struct file *file, char __user *buf,
return cnt == 0 ? error : cnt;
}
static unsigned int spufs_switch_log_poll(struct file *file, poll_table *wait)
static __poll_t spufs_switch_log_poll(struct file *file, poll_table *wait)
{
struct inode *inode = file_inode(file);
struct spu_context *ctx = SPUFS_I(inode)->i_ctx;
unsigned int mask = 0;
__poll_t mask = 0;
int rc;
poll_wait(file, &ctx->switch_log->wait, wait);

5
arch/powerpc/platforms/cell/spufs/hw_ops.c
View File

@ -56,11 +56,10 @@ static u32 spu_hw_mbox_stat_read(struct spu_context *ctx)
return in_be32(&ctx->spu->problem->mb_stat_R);
}
static unsigned int spu_hw_mbox_stat_poll(struct spu_context *ctx,
unsigned int events)
static __poll_t spu_hw_mbox_stat_poll(struct spu_context *ctx, __poll_t events)
{
struct spu *spu = ctx->spu;
int ret = 0;
__poll_t ret = 0;
u32 stat;
spin_lock_irq(&spu->register_lock);

3
arch/powerpc/platforms/cell/spufs/spufs.h
View File

@ -185,8 +185,7 @@ struct mfc_dma_command {
struct spu_context_ops {
int (*mbox_read) (struct spu_context * ctx, u32 * data);
u32(*mbox_stat_read) (struct spu_context * ctx);
unsigned int (*mbox_stat_poll)(struct spu_context *ctx,
unsigned int events);
__poll_t (*mbox_stat_poll)(struct spu_context *ctx, __poll_t events);
int (*ibox_read) (struct spu_context * ctx, u32 * data);
int (*wbox_write) (struct spu_context * ctx, u32 data);
u32(*signal1_read) (struct spu_context * ctx);

2
arch/powerpc/platforms/powernv/opal-prd.c
View File

@ -147,7 +147,7 @@ static bool opal_msg_queue_empty(void)
return ret;
}
static unsigned int opal_prd_poll(struct file *file,
static __poll_t opal_prd_poll(struct file *file,
struct poll_table_struct *wait)
{
poll_wait(file, &opal_prd_msg_wait, wait);