linux-kernel - Re: [PATCH] ARM: mx51_efika: update platform data for new mfd changes

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: <20110307085358.GM29521@pengutronix.de>
Date:	Mon, 7 Mar 2011 09:53:58 +0100
From:	Sascha Hauer <s.hauer@...gutronix.de>
To:	Andres Salomon <dilinger@...ued.net>
Cc:	Samuel Ortiz <sameo@...ux.intel.com>,
	Sascha Hauer <kernel@...gutronix.de>,
	Amit Kucheria <amit.kucheria@...onical.com>,
	Russell King <linux@....linux.org.uk>,
	linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org,
	Uwe Kleine-König 
	<u.kleine-koenig@...gutronix.de>
Subject: Re: [PATCH] ARM: mx51_efika: update platform data for new mfd
 changes

On Fri, Mar 04, 2011 at 08:06:53AM -0800, Andres Salomon wrote:
> Note that this relies on stuff currently in mfd's next tree, but this
> is also a newer driver.  I'm not sure which tree it should go through,
> as it's a problem that shows up in next.

Please ping me again when the mfd tree is in Linus master. I see no
other chance fixing this on my side other than removing regulator
support for efika completely for now. So I guess you have to live with
the compile breakage for some time.

Sascha

> 
> 
> 
> From: Andres Salomon <dilinger@...ued.net>
> 
> MFD changes in c738892f cause the mc13xxx_platform_data struct
> to change.  This changes one more (new) user of it, fixing a build
> error.
> 
> Signed-off-by: Andres Salomon <dilinger@...ued.net>
> ---
>  arch/arm/mach-mx5/mx51_efika.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-mx5/mx51_efika.c b/arch/arm/mach-mx5/mx51_efika.c
> index 74991c9..6451fb4 100644
> --- a/arch/arm/mach-mx5/mx51_efika.c
> +++ b/arch/arm/mach-mx5/mx51_efika.c
> @@ -572,8 +572,10 @@ static struct mc13xxx_regulator_init_data mx51_efika_regulators[] = {
>  
>  static struct mc13xxx_platform_data mx51_efika_mc13892_data = {
>  	.flags = MC13XXX_USE_RTC | MC13XXX_USE_REGULATOR,
> -	.num_regulators = ARRAY_SIZE(mx51_efika_regulators),
> -	.regulators = mx51_efika_regulators,
> +	.regulators = {
> +		.num_regulators = ARRAY_SIZE(mx51_efika_regulators),
> +		.regulators = mx51_efika_regulators,
> +	},
>  };
>  
>  static struct spi_board_info mx51_efika_spi_board_info[] __initdata = {
> -- 
> 1.7.2.3
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/