Hi Ilya,
Please, Cc the [email protected] for patches,
so Tony, or whoever will not need to resend them...
On 12/21/11 18:31, Ilya Yanok wrote:
> If platform data is provided by the caller gpio_pendown is put into
> unused static ads7846_config structure and effectively has no effect.
> Of course caller can set gpio_pendown field in platform data himself
> but it seems natural to do this in ads7846_init to remove duplication.
>
> Signed-off-by: Ilya Yanok <[email protected]>
> ---
> arch/arm/mach-omap2/common-board-devices.c | 5 ++++-
> 1 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/common-board-devices.c
> b/arch/arm/mach-omap2/common-board-devices.c
> index 2d1d775..eb408dd 100644
> --- a/arch/arm/mach-omap2/common-board-devices.c
> +++ b/arch/arm/mach-omap2/common-board-devices.c
> @@ -75,7 +75,10 @@ void __init omap_ads7846_init(int bus_num, int
> gpio_pendown, int gpio_debounce,
> gpio_set_debounce(gpio_pendown, gpio_debounce);
> }
>
> - ads7846_config.gpio_pendown = gpio_pendown;
> + if (!board_pdata)
> + ads7846_config.gpio_pendown = gpio_pendown;
> + else
> + board_pdata->gpio_pendown = gpio_pendown;
>
> spi_bi->bus_num = bus_num;
> spi_bi->irq = OMAP_GPIO_IRQ(gpio_pendown);
The fact that the ads7846_config has no effect in case
the board_pdata is provided does not really meter...
How about reusing the existing "if" instead of adding another one?
Like in the attached patch?
--
Regards,
Igor.
diff --git a/arch/arm/mach-omap2/common-board-devices.c b/arch/arm/mach-omap2/common-board-devices.c
index 94ccf46..e8a7368 100644
--- a/arch/arm/mach-omap2/common-board-devices.c
+++ b/arch/arm/mach-omap2/common-board-devices.c
@@ -102,8 +102,10 @@ void __init omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce,
spi_bi->bus_num = bus_num;
spi_bi->irq = OMAP_GPIO_IRQ(gpio_pendown);
- if (board_pdata)
+ if (board_pdata) {
+ board_pdata->gpio_pendown = gpio_pendown;
spi_bi->platform_data = board_pdata;
+ }
spi_register_board_info(&ads7846_spi_board_info, 1);
}
