Re: linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi all,

On Mon, 7 Dec 2020 16:46:01 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi all,
> 
> After merging the staging tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/iio/trigger/iio-trig-sysfs.c: In function 'iio_sysfs_trigger_probe':
> drivers/iio/trigger/iio-trig-sysfs.c:164:21: error: 'struct irq_work' has no member named 'flags'
>   164 |  atomic_set(&t->work.flags, IRQ_WORK_HARD_IRQ);
>       |                     ^
> 
> Caused by commit
> 
>   0449fc4eead7 ("iio: sysfs-trigger: Mark irq_work to expire in hardirq context")
> 
> interacting with commit
> 
>   7a9f50a05843 ("irq_work: Cleanup")
> 
> from the tip tree.
> 
> I applied the following merge fix patch:
> 
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Mon, 7 Dec 2020 16:42:18 +1100
> Subject: [PATCH] fixup for "irq_work: Cleanup"
> 
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
>  drivers/iio/trigger/iio-trig-sysfs.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/iio/trigger/iio-trig-sysfs.c b/drivers/iio/trigger/iio-trig-sysfs.c
> index 10a3fd29362b..0f6b512a5c37 100644
> --- a/drivers/iio/trigger/iio-trig-sysfs.c
> +++ b/drivers/iio/trigger/iio-trig-sysfs.c
> @@ -160,8 +160,7 @@ static int iio_sysfs_trigger_probe(int id)
>  	t->trig->dev.parent = &iio_sysfs_trig_dev;
>  	iio_trigger_set_drvdata(t->trig, t);
>  
> -	init_irq_work(&t->work, iio_sysfs_trigger_work);
> -	atomic_set(&t->work.flags, IRQ_WORK_HARD_IRQ);
> +	t->work = IRQ_WORK_INIT_HARD(iio_sysfs_trigger_work);
>  
>  	ret = iio_trigger_register(t->trig);
>  	if (ret)

Just a reminder that I am still applying this merge fix.
-- 
Cheers,
Stephen Rothwell

Attachment: pgpmhaMgsLpqn.pgp
Description: OpenPGP digital signature