linux-kernel - Re: linux-next: manual merge of the iio tree with the char-misc.current tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20220429144721.63ae260f@canb.auug.org.au>
Date:   Fri, 29 Apr 2022 14:47:21 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jonathan Cameron <Jonathan.Cameron@...wei.com>,
        Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>
Cc:     Jose Cazarin <joseespiriki@...il.com>,
        Laurent Pinchart <laurent.pinchart@...asonboard.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Peter Rosin <peda@...ntia.se>
Subject: Re: linux-next: manual merge of the iio tree with the
 char-misc.current tree

Hi all,

On Fri, 29 Apr 2022 14:35:17 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> diff --cc drivers/iio/dac/ti-dac5571.c
> index 0b775f943db3,96b86e2dcc6b..000000000000
> --- a/drivers/iio/dac/ti-dac5571.c
> +++ b/drivers/iio/dac/ti-dac5571.c
> @@@ -393,15 -386,16 +394,16 @@@ static int dac5571_remove(struct i2c_cl
>   }
>   
>   static const struct of_device_id dac5571_of_id[] = {
>  -	{.compatible = "ti,dac5571"},
>  -	{.compatible = "ti,dac6571"},
>  -	{.compatible = "ti,dac7571"},
>  -	{.compatible = "ti,dac5574"},
>  -	{.compatible = "ti,dac6574"},
>  -	{.compatible = "ti,dac7574"},
>  -	{.compatible = "ti,dac5573"},
>  -	{.compatible = "ti,dac6573"},
>  -	{.compatible = "ti,dac7573"},
>  -	{.compatible = "ti,dac121c081"},
>  +	{.compatible = "ti,dac5571", .data = (void *)single_8bit},
>  +	{.compatible = "ti,dac6571", .data = (void *)single_10bit},
>  +	{.compatible = "ti,dac7571", .data = (void *)single_12bit},
>  +	{.compatible = "ti,dac5574", .data = (void *)quad_8bit},
>  +	{.compatible = "ti,dac6574", .data = (void *)quad_10bit},
>  +	{.compatible = "ti,dac7574", .data = (void *)quad_12bit},
>  +	{.compatible = "ti,dac5573", .data = (void *)quad_8bit},
>  +	{.compatible = "ti,dac6573", .data = (void *)quad_10bit},
>  +	{.compatible = "ti,dac7573", .data = (void *)quad_12bit},
> ++	{.compatible = "ti,dac121c081", data = (void *)single_12bit},
                                        ^
I fixed up the missing '.'

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped