2021-08-14 20:21:32

by Aakash Hemadri

Subject: [PATCH 0/3] ASoC: ti: Use of_device_get_match_data

Hi,
This patch series will apply cleanly on for-next
Prefer `of_device_get_match_data` over `of_match_device`.

Aakash Hemadri (3):
ASoC: ti: davinci-mcasp: Use of_device_get_match_data
ASoC: ti: omap-mcbsp: Use of_device_get_match_data
ASoC: ti: davinci-evm: Use of_device_get_match_data

sound/soc/ti/davinci-evm.c | 2 +-
sound/soc/ti/davinci-mcasp.c | 2 +-
sound/soc/ti/omap-mcbsp.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

--
2.32.0

2021-08-14 20:21:37

by Aakash Hemadri

Subject: [PATCH 1/3] ASoC: ti: davinci-mcasp: Use of_device_get_match_data

Prefer `of_device_get_match_data` over `of_match_device`

Retrieve OF match data using `of_device_get_match_data`, this is cleaner
and better expresses intent.

Signed-off-by: Aakash Hemadri <[email protected]>
---
sound/soc/ti/davinci-mcasp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c
index 56a19eeec5c7..b26e8d324078 100644
--- a/sound/soc/ti/davinci-mcasp.c
+++ b/sound/soc/ti/davinci-mcasp.c
@@ -1881,7 +1881,7 @@ static bool davinci_mcasp_have_gpiochip(struct davinci_mcasp *mcasp)
static int davinci_mcasp_get_config(struct davinci_mcasp *mcasp,
struct platform_device *pdev)
{
- const struct of_device_id *match = of_match_device(mcasp_dt_ids, &pdev->dev);
+ const struct of_device_id *match = of_device_get_match_data(&pdev->dev);
struct device_node *np = pdev->dev.of_node;
struct davinci_mcasp_pdata *pdata = NULL;
const u32 *of_serial_dir32;
--
2.32.0

2021-08-14 20:24:46

by Aakash Hemadri

Subject: [PATCH 3/3] ASoC: ti: davinci-evm: Use of_device_get_match_data

Prefer `of_device_get_match_data` over `of_match_device`

Retrieve OF match data using `of_device_get_match_data`, this is cleaner
and better expresses intent.

Signed-off-by: Aakash Hemadri <[email protected]>
---
sound/soc/ti/davinci-evm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/ti/davinci-evm.c b/sound/soc/ti/davinci-evm.c
index b043a0070d20..bf13f3d25cec 100644
--- a/sound/soc/ti/davinci-evm.c
+++ b/sound/soc/ti/davinci-evm.c
@@ -389,7 +389,7 @@ static int davinci_evm_probe(struct platform_device *pdev)
struct clk *mclk;
int ret = 0;

- match = of_match_device(of_match_ptr(davinci_evm_dt_ids), &pdev->dev);
+ match = of_device_get_match_data(&pdev->dev);
if (!match) {
dev_err(&pdev->dev, "Error: No device match found\n");
return -ENODEV;
--
2.32.0

2021-08-16 18:35:32

by Péter Ujfalusi

Subject: Re: [PATCH 3/3] ASoC: ti: davinci-evm: Use of_device_get_match_data

On 14/08/2021 23:19, Aakash Hemadri wrote:
> Prefer `of_device_get_match_data` over `of_match_device`
>
> Retrieve OF match data using `of_device_get_match_data`, this is cleaner
> and better expresses intent.
>
> Signed-off-by: Aakash Hemadri <[email protected]>
> ---
> sound/soc/ti/davinci-evm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/soc/ti/davinci-evm.c b/sound/soc/ti/davinci-evm.c
> index b043a0070d20..bf13f3d25cec 100644
> --- a/sound/soc/ti/davinci-evm.c
> +++ b/sound/soc/ti/davinci-evm.c
> @@ -389,7 +389,7 @@ static int davinci_evm_probe(struct platform_device *pdev)
> struct clk *mclk;
> int ret = 0;
>
> - match = of_match_device(of_match_ptr(davinci_evm_dt_ids), &pdev->dev);
> + match = of_device_get_match_data(&pdev->dev);

incorrect,
of_device_get_match_data() is retrieving the match->data

> if (!match) {
> dev_err(&pdev->dev, "Error: No device match found\n");
> return -ENODEV;
>

--
Péter

2021-08-16 18:35:36

by Péter Ujfalusi

Subject: Re: [PATCH 1/3] ASoC: ti: davinci-mcasp: Use of_device_get_match_data

On 14/08/2021 23:19, Aakash Hemadri wrote:
> Prefer `of_device_get_match_data` over `of_match_device`
>
> Retrieve OF match data using `of_device_get_match_data`, this is cleaner
> and better expresses intent.
>
> Signed-off-by: Aakash Hemadri <[email protected]>
> ---
> sound/soc/ti/davinci-mcasp.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c
> index 56a19eeec5c7..b26e8d324078 100644
> --- a/sound/soc/ti/davinci-mcasp.c
> +++ b/sound/soc/ti/davinci-mcasp.c
> @@ -1881,7 +1881,7 @@ static bool davinci_mcasp_have_gpiochip(struct davinci_mcasp *mcasp)
> static int davinci_mcasp_get_config(struct davinci_mcasp *mcasp,
> struct platform_device *pdev)
> {
> - const struct of_device_id *match = of_match_device(mcasp_dt_ids, &pdev->dev);
> + const struct of_device_id *match = of_device_get_match_data(&pdev->dev);

No.
of_device_get_match_data() returns the match->data

> struct device_node *np = pdev->dev.of_node;
> struct davinci_mcasp_pdata *pdata = NULL;
> const u32 *of_serial_dir32;
>

--
Péter

2021-08-16 18:38:16

by Péter Ujfalusi

Subject: Re: [PATCH 0/3] ASoC: ti: Use of_device_get_match_data

Hi,

On 14/08/2021 23:19, Aakash Hemadri wrote:
> Hi,
> This patch series will apply cleanly on for-next
> Prefer `of_device_get_match_data` over `of_match_device`.

All three patch is wrong.
Mark, please do not pick them up.

> Aakash Hemadri (3):
> ASoC: ti: davinci-mcasp: Use of_device_get_match_data
> ASoC: ti: omap-mcbsp: Use of_device_get_match_data
> ASoC: ti: davinci-evm: Use of_device_get_match_data
>
> sound/soc/ti/davinci-evm.c | 2 +-
> sound/soc/ti/davinci-mcasp.c | 2 +-
> sound/soc/ti/omap-mcbsp.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>

--
Péter