[PATCH 2/2] gpio-rcar: Remove #ifdef CONFIG_OF around OF-specific sections

[Sergei Shtylyov]

Hello.

On 06/17/2013 11:15 PM, Laurent Pinchart wrote:

> All functions and data types used by OF-specific code paths are declared
> in <linux/of.h> regardless of CONFIG_OF. Replace the #ifdef CONFIG_OF
> guard with a if(IS_SELECTED(CONFIG_OF)) and let the compiler optimize

    You're using IS_ENABLED() actually.

> the unused code away.

> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas at ideasonboard.com>
> ---
>   drivers/gpio/gpio-rcar.c | 8 ++------
>   1 file changed, 2 insertions(+), 6 deletions(-)

> diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
> index 5a693dd..7fd09ef 100644
> --- a/drivers/gpio/gpio-rcar.c
> +++ b/drivers/gpio/gpio-rcar.c
> @@ -279,16 +279,13 @@ static struct irq_domain_ops gpio_rcar_irq_domain_ops = {
>   static void gpio_rcar_parse_pdata(struct gpio_rcar_priv *p)
>   {
>   	struct gpio_rcar_config *pdata = p->pdev->dev.platform_data;
> -#ifdef CONFIG_OF
>   	struct device_node *np = p->pdev->dev.of_node;
>   	struct of_phandle_args args;
>   	int ret;
> -#endif
>
> -	if (pdata)
> +	if (pdata) {
>   		p->config = *pdata;
> -#ifdef CONFIG_OF
> -	else if (np) {
> +	} else if (IS_ENABLED(CONFIG_OF) && np) {
>   		ret = of_parse_phandle_with_args(np, "gpio-ranges",
>   				"#gpio-range-cells", 0, &args);
>   		p->config.number_of_pins = ret == 0 && args.args_count == 3

WBR, Sergei