[PATCH 3/6] ARM: i.MX6: skov: refactor LVDS/parallel device tree fixups

[Marco Felsch]

On 22-12-22, Ahmad Fatoum wrote:
> In preparation for a fix in a follow-up commit, refactor the code, so
> each fixup is done in its own function. This enables easy early exists
> without increasing indentation level. No functional change
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>

Reviewed-by: Marco Felsch <m.felsch at pengutronix.de>

> ---
>  arch/arm/boards/skov-imx6/board.c | 59 +++++++++++++++++++------------
>  1 file changed, 37 insertions(+), 22 deletions(-)
> 
> diff --git a/arch/arm/boards/skov-imx6/board.c b/arch/arm/boards/skov-imx6/board.c
> index d5d229ae81ac..7ddc6e937b0b 100644
> --- a/arch/arm/boards/skov-imx6/board.c
> +++ b/arch/arm/boards/skov-imx6/board.c
> @@ -451,6 +451,39 @@ static int skov_imx6_fixup(struct device_node *root, void *unused)
>  	return 0;
>  }
>  
> +static void skov_init_parallel_lcd(void)
> +{
> +	struct device_node *lcd;
> +
> +	lcd = of_find_compatible_node(NULL, NULL, "fsl,imx-parallel-display");
> +	if (!lcd) {
> +		dev_err(skov_priv->dev, "Cannot find \"fsl,imx-parallel-display\" node\n");
> +		return;
> +	}
> +
> +	of_device_enable_and_register(lcd);
> +}
> +
> +static void skov_init_ldb(void)
> +{
> +	struct device_node *ldb, *chan;
> +
> +	ldb = of_find_compatible_node(NULL, NULL, "fsl,imx6q-ldb");
> +	if (!ldb) {
> +		dev_err(skov_priv->dev, "Cannot find \"fsl,imx6q-ldb\" node\n");
> +		return;
> +	}
> +
> +	of_device_enable_and_register(ldb);
> +
> +	/* ... as well as its channel 0 */
> +	chan = of_find_node_by_name_address(ldb, "lvds-channel at 0");
> +	if (chan)
> +		of_device_enable(chan);
> +	else
> +		dev_err(skov_priv->dev, "Cannot find \"lvds-channel at 0\" node\n");
> +}
> +
>  /*
>   * Some variants need tweaks to make them work
>   *
> @@ -461,7 +494,6 @@ static int skov_imx6_fixup(struct device_node *root, void *unused)
>  static void skov_init_board(const struct board_description *variant)
>  {
>  	struct device_node *gpio_np = NULL;
> -	struct device_node *np;
>  	char *environment_path, *envdev;
>  	int ret;
>  
> @@ -524,28 +556,11 @@ static void skov_init_board(const struct board_description *variant)
>  		gpio_free(200);
>  	}
>  
> -	if (variant->flags & SKOV_DISPLAY_PARALLEL) {
> -		np = of_find_compatible_node(NULL, NULL, "fsl,imx-parallel-display");
> -		if (np)
> -			of_device_enable_and_register(np);
> -		else
> -			dev_err(skov_priv->dev, "Cannot find \"fsl,imx-parallel-display\" node\n");
> -	}
> +	if (variant->flags & SKOV_DISPLAY_PARALLEL)
> +		skov_init_parallel_lcd();
>  
> -	if (variant->flags & SKOV_DISPLAY_LVDS) {
> -		np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-ldb");
> -		if (np)
> -			of_device_enable_and_register(np);
> -		else
> -			dev_err(skov_priv->dev, "Cannot find \"fsl,imx6q-ldb\" node\n");
> -
> -		/* ... as well as its channel 0 */
> -		np = of_find_node_by_name_address(np, "lvds-channel at 0");
> -		if (np)
> -			of_device_enable(np);
> -		else
> -			dev_err(skov_priv->dev, "Cannot find \"lvds-channel at 0\" node\n");
> -	}
> +	if (variant->flags & SKOV_DISPLAY_LVDS)
> +		skov_init_ldb();
>  }
>  
>  static int skov_set_switch_lan2_mac(struct skov_imx6_priv *priv)
> -- 
> 2.30.2
> 
> 
>