lkml.org 
[lkml]   [2012]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 2/9] ARM: at91/snapper9260: move gpio_to_irq out of structure initialization
On 02/13/2012 09:02 PM, Ryan Mallon :
> 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.

Linux vIRQ numbers will be allocated dynamically when switching to
irqdomains. That will prevent the use of a static operation in a macro.

> Reviewed-by: Ryan Mallon <rmallon@gmail.com>

Thanks.

>> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
>> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
>> Cc: rmallon@gmail.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);
>
>
>


--
Nicolas Ferre


\
 
 \ /
  Last update: 2012-02-14 10:07    [from the cache]
©2003-2011 Jasper Spaans