Unverified Commit 67ad656b authored Oct 04, 2019 by Stephen Boyd Committed by Mark Brown Oct 07, 2019

ASoC: jz4740: Use of_device_get_match_data()

This probe function is only called if the device is backed by a DT node,
so switch this call to of_device_get_match_data() to reduce code size
and simplify a bit. This also avoids needing to reference a potentially
undefined variable because of_device_get_match_data() doesn't need to
know anything beyond the struct device to find the match table.

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Frank Rowand <frowand.list@gmail.com>
Cc: <alsa-devel@alsa-project.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/20191004214334.149976-8-swboyd@chromium.org

Signed-off-by: Mark Brown <broonie@kernel.org>

parent 01400bfb

sound/soc/jz4740/jz4740-i2s.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -503,9 +503,8 @@ static int jz4740_i2s_dev_probe(struct platform_device *pdev)
		if (!i2s)
		return -ENOMEM;

		match = of_match_device(jz4740_of_matches, &pdev->dev);
		if (match)
		i2s->version = (enum jz47xx_i2s_version)match->data;
		i2s->version =
		(enum jz47xx_i2s_version)of_device_get_match_data(&pdev->dev);

		mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		i2s->base = devm_ioremap_resource(&pdev->dev, mem);

Admin message