On Tue, Aug 17, 2021 at 02:44:51AM +0530, Aakash Hemadri wrote:
> const struct of_device_id incorrectly assigned "match->data" using
> of_device_get_match_data()
>
> Instead assign `const struct tegra30_ahub_soc_data *soc_data` with
> const void *of_device_get_match_data(...)
>
> Fixes: 80165bb80433 ("ASoC: tegra30: ahub: Use of_device_get_match_data")
>
> Signed-off-by: Aakash Hemadri <aakashhemadri123@xxxxxxxxx>
> ---
> sound/soc/tegra/tegra30_ahub.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/sound/soc/tegra/tegra30_ahub.c b/sound/soc/tegra/tegra30_ahub.c
> index 0ac109b32329..ef011a488ceb 100644
> --- a/sound/soc/tegra/tegra30_ahub.c
> +++ b/sound/soc/tegra/tegra30_ahub.c
> @@ -512,16 +512,14 @@ static const struct of_device_id tegra30_ahub_of_match[] = {
>
> static int tegra30_ahub_probe(struct platform_device *pdev)
> {
> - const struct of_device_id *match;
> const struct tegra30_ahub_soc_data *soc_data;
> struct resource *res0;
> void __iomem *regs_apbif, *regs_ahub;
> int ret = 0;
>
> - match = of_device_get_match_data(&pdev->dev);
> - if (!match)
> + soc_data = of_device_get_match_data(&pdev->dev);
> + if (!soc_data)
> return -EINVAL;
> - soc_data = match->data;
Minor nit: !soc_data can actually never happen for this driver. First,
tegra30_ahub_probe() will only ever be called if there was a match with
an entry from the OF device ID table, and then all entries have .data
set to a valid point.
It's a pre-existing issue, but since all of the surrounding code is
already getting updated, perhaps it'd be a good idea to fix that up
while at it.
Thierry
Attachment:
signature.asc
Description: PGP signature
