linux-kernel - Re: [PATCH v3 1/6] usb: gadget: udc: atmel: use of_find_matching_node_and

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <9cf8e546-09ce-d902-6dca-e2490fd8c4ae@microchip.com>
Date:   Wed, 22 Jul 2020 14:43:39 +0000
From:   <Claudiu.Beznea@...rochip.com>
To:     <Cristian.Birsan@...rochip.com>, <balbi@...nel.org>,
        <gregkh@...uxfoundation.org>, <Nicolas.Ferre@...rochip.com>,
        <alexandre.belloni@...tlin.com>, <Ludovic.Desroches@...rochip.com>,
        <robh+dt@...nel.org>, <mark.rutland@....com>,
        <linux-arm-kernel@...ts.infradead.org>,
        <linux-usb@...r.kernel.org>, <devicetree@...r.kernel.org>,
        <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v3 1/6] usb: gadget: udc: atmel: use
 of_find_matching_node_and_match



On 22.07.2020 16:44, cristian.birsan@...rochip.com wrote:
> From: Claudiu Beznea <claudiu.beznea@...rochip.com>
> 
> Instead of trying to match every possible compatible use
> of_find_matching_node_and_match() and pass the compatible array.
> 
> Signed-off-by: Claudiu Beznea <claudiu.beznea@...rochip.com>
> ---
>  drivers/usb/gadget/udc/atmel_usba_udc.c | 25 ++++++++++++++++++-------
>  1 file changed, 18 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
> index c5128c229c52..ee2b550aa400 100644
> --- a/drivers/usb/gadget/udc/atmel_usba_udc.c
> +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
> @@ -2112,6 +2112,13 @@ static const struct of_device_id atmel_udc_dt_ids[] = {
>  
>  MODULE_DEVICE_TABLE(of, atmel_udc_dt_ids);
>  
> +static const struct of_device_id atmel_pmc_dt_ids[] = {
> +	{ .compatible = "atmel,at91sam9g45-pmc" },
> +	{ .compatible = "atmel,at91sam9rl-pmc" },
> +	{ .compatible = "atmel,at91sam9x5-pmc" },
> +	{ /* sentinel */ }
> +};
> +
>  static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev,
>  						    struct usba_udc *udc)
>  {
> @@ -2128,13 +2135,17 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev,
>  
>  	udc_config = match->data;
>  	udc->errata = udc_config->errata;
> -	udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9g45-pmc");
> -	if (IS_ERR(udc->pmc))
> -		udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9rl-pmc");
> -	if (IS_ERR(udc->pmc))
> -		udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9x5-pmc");
> -	if (udc->errata && IS_ERR(udc->pmc))
> -		return ERR_CAST(udc->pmc);
> +	if (udc->errata) {
> +		pp = of_find_matching_node_and_match(NULL, atmel_pmc_dt_ids,
> +						     NULL);
> +		if (!pp)
> +			return ERR_PTR(-ENODEV);
> +
> +		udc->pmc = syscon_node_to_regmap(pp);
> +		of_node_put(pp);
> +		if (IS_ERR(udc->pmc))
> +			return ERR_CAST(udc->pmc);
> +	}

This seems a bit not similar. I may had been wrong at the moment I wrote
this patch. Probably the best would be:

+	udc->pmc = ERR_PTR(-ENODEV);
+	pp = of_find_matching_node_and_match(NULL, atmel_pmc_dt_ids,
+					     NULL);
+	if (pp) {
+		udc->pmc = syscon_node_to_regmap(pp);
+		of_node_put(pp);
+	}
+
+	if ((!pp || IS_ERR(udc->pmc)) && udc->errata)
+		return ERR_CAST(udc->pmc);

Thank you,
Claudiu Beznea

>  
>  	udc->num_ep = 0;
>  
>