[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4F396C4C.9060108@gmail.com>
Date: Tue, 14 Feb 2012 07:02:20 +1100
From: Ryan Mallon <rmallon@...il.com>
To: Nicolas Ferre <nicolas.ferre@...el.com>
CC: plagnioj@...osoft.com, linux-arm-kernel@...ts.infradead.org,
grant.likely@...retlab.ca, rob.herring@...xeda.com,
tglx@...utronix.de, devicetree-discuss@...ts.ozlabs.org,
avictor.za@...il.com, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 2/9] ARM: at91/snapper9260: move gpio_to_irq out of structure
initialization
On 14/02/12 01:43, Nicolas Ferre wrote:
> gpio_to_irq() implementation will be moved from a macro to a
> plain function: we cannot use it in a structure initialization
> anymore.
What was the reason for the change? It was originally a macro for
exactly this reason.
Anyway,
Reviewed-by: Ryan Mallon <rmallon@...il.com>
> Signed-off-by: Nicolas Ferre <nicolas.ferre@...el.com>
> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@...osoft.com>
> Cc: rmallon@...il.com
> ---
> arch/arm/mach-at91/board-snapper9260.c | 10 +++++++---
> 1 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-at91/board-snapper9260.c b/arch/arm/mach-at91/board-snapper9260.c
> index 4770db0..3c2e3fc 100644
> --- a/arch/arm/mach-at91/board-snapper9260.c
> +++ b/arch/arm/mach-at91/board-snapper9260.c
> @@ -145,11 +145,11 @@ static struct i2c_board_info __initdata snapper9260_i2c_devices[] = {
> /* Audio codec */
> I2C_BOARD_INFO("tlv320aic23", 0x1a),
> },
> - {
> +};
> +
> +static struct i2c_board_info __initdata snapper9260_i2c_isl1208 = {
> /* RTC */
> I2C_BOARD_INFO("isl1208", 0x6f),
> - .irq = gpio_to_irq(AT91_PIN_PA31),
> - },
> };
>
> static void __init snapper9260_add_device_nand(void)
> @@ -163,6 +163,10 @@ static void __init snapper9260_board_init(void)
> {
> at91_add_device_i2c(snapper9260_i2c_devices,
> ARRAY_SIZE(snapper9260_i2c_devices));
> +
> + snapper9260_i2c_isl1208.irq = gpio_to_irq(AT91_PIN_PA31);
> + i2c_register_board_info(0, &snapper9260_i2c_isl1208, 1);
> +
> at91_add_device_serial();
> at91_add_device_usbh(&snapper9260_usbh_data);
> at91_add_device_udc(&snapper9260_udc_data);
--
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/
Powered by blists - more mailing lists