2022-02-25 01:28:53

by CGEL

Subject: [PATCH V2] platforms/83xx: Use of_device_get_match_data()

From: Minghao Chi (CGEL ZTE) <[email protected]>

Use of_device_get_match_data() to simplify the code.
v1->v2:
Add a judgment on the return value of the A function as NULL

Reported-by: Zeal Robot <[email protected]>
Signed-off-by: Minghao Chi (CGEL ZTE) <[email protected]>
---
arch/powerpc/platforms/83xx/suspend.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/platforms/83xx/suspend.c b/arch/powerpc/platforms/83xx/suspend.c
index bb147d34d4a6..6d47a5b81485 100644
--- a/arch/powerpc/platforms/83xx/suspend.c
+++ b/arch/powerpc/platforms/83xx/suspend.c
@@ -322,18 +322,15 @@ static const struct platform_suspend_ops mpc83xx_suspend_ops = {
static const struct of_device_id pmc_match[];
static int pmc_probe(struct platform_device *ofdev)
{
- const struct of_device_id *match;
struct device_node *np = ofdev->dev.of_node;
struct resource res;
const struct pmc_type *type;
int ret = 0;

- match = of_match_device(pmc_match, &ofdev->dev);
- if (!match)
+ type = of_device_get_match_data(&ofdev->dev);
+ if (!type)
return -EINVAL;

- type = match->data;
-
if (!of_device_is_available(np))
return -ENODEV;

--
2.25.1

2022-05-24 18:07:30

by Michael Ellerman

Subject: Re: [PATCH V2] platforms/83xx: Use of_device_get_match_data()

On Fri, 25 Feb 2022 01:07:37 +0000, [email protected] wrote:
> From: Minghao Chi (CGEL ZTE) <[email protected]>
>
> Use of_device_get_match_data() to simplify the code.
> v1->v2:
> Add a judgment on the return value of the A function as NULL
>
>
> [...]

Applied to powerpc/next.

[1/1] platforms/83xx: Use of_device_get_match_data()
https://git.kernel.org/powerpc/c/8a57c3cc2bcb8df98c239d6804fd01834960b7d2

cheers

2022-05-26 00:46:34

by Christophe JAILLET

Subject: Re: [PATCH V2] platforms/83xx: Use of_device_get_match_data()

Le 25/02/2022 à 02:07, [email protected] a écrit :
> From: Minghao Chi (CGEL ZTE) <[email protected]>
>
> Use of_device_get_match_data() to simplify the code.
> v1->v2:
> Add a judgment on the return value of the A function as NULL
>
> Reported-by: Zeal Robot <[email protected]>
> Signed-off-by: Minghao Chi (CGEL ZTE) <[email protected]>
> ---
> arch/powerpc/platforms/83xx/suspend.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/arch/powerpc/platforms/83xx/suspend.c b/arch/powerpc/platforms/83xx/suspend.c
> index bb147d34d4a6..6d47a5b81485 100644
> --- a/arch/powerpc/platforms/83xx/suspend.c
> +++ b/arch/powerpc/platforms/83xx/suspend.c
> @@ -322,18 +322,15 @@ static const struct platform_suspend_ops mpc83xx_suspend_ops = {
> static const struct of_device_id pmc_match[];

Hi,
I think that the line above can now be removed as well.

just my 2c.

CJ


> static int pmc_probe(struct platform_device *ofdev)
> {
> - const struct of_device_id *match;
> struct device_node *np = ofdev->dev.of_node;
> struct resource res;
> const struct pmc_type *type;
> int ret = 0;
>
> - match = of_match_device(pmc_match, &ofdev->dev);
> - if (!match)
> + type = of_device_get_match_data(&ofdev->dev);
> + if (!type)
> return -EINVAL;
>
> - type = match->data;
> -
> if (!of_device_is_available(np))
> return -ENODEV;
>