All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Boyd <swboyd@chromium.org>
To: linux-kernel@vger.kernel.org
Cc: Arnd Bergmann <arnd@arndb.de>,
	Geert Uytterhoeven <geert@linux-m68k.org>,
	Paul Cercueil <paul@crapouillou.net>,
	Liam Girdwood <lgirdwood@gmail.com>,
	Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
	Takashi Iwai <tiwai@suse.com>, Rob Herring <robh+dt@kernel.org>,
	Frank Rowand <frowand.list@gmail.com>,
	alsa-devel@alsa-project.org
Subject: [PATCH 07/10] ASoC: jz4740: Use of_device_get_match_data()
Date: Fri,  4 Oct 2019 14:43:31 -0700	[thread overview]
Message-ID: <20191004214334.149976-8-swboyd@chromium.org> (raw)
In-Reply-To: <20191004214334.149976-1-swboyd@chromium.org>

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>
---

Please ack or pick for immediate merge so the last patch can be merged.

 sound/soc/jz4740/jz4740-i2s.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c
index 13408de34055..d2dab4d24b87 100644
--- a/sound/soc/jz4740/jz4740-i2s.c
+++ b/sound/soc/jz4740/jz4740-i2s.c
@@ -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);
-- 
Sent by a computer through tubes


WARNING: multiple messages have this Message-ID (diff)
From: Stephen Boyd <swboyd@chromium.org>
To: linux-kernel@vger.kernel.org
Cc: alsa-devel@alsa-project.org, Arnd Bergmann <arnd@arndb.de>,
	Takashi Iwai <tiwai@suse.com>,
	Liam Girdwood <lgirdwood@gmail.com>,
	Rob Herring <robh+dt@kernel.org>,
	Paul Cercueil <paul@crapouillou.net>,
	Mark Brown <broonie@kernel.org>,
	Geert Uytterhoeven <geert@linux-m68k.org>,
	Frank Rowand <frowand.list@gmail.com>
Subject: [alsa-devel] [PATCH 07/10] ASoC: jz4740: Use of_device_get_match_data()
Date: Fri,  4 Oct 2019 14:43:31 -0700	[thread overview]
Message-ID: <20191004214334.149976-8-swboyd@chromium.org> (raw)
In-Reply-To: <20191004214334.149976-1-swboyd@chromium.org>

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>
---

Please ack or pick for immediate merge so the last patch can be merged.

 sound/soc/jz4740/jz4740-i2s.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c
index 13408de34055..d2dab4d24b87 100644
--- a/sound/soc/jz4740/jz4740-i2s.c
+++ b/sound/soc/jz4740/jz4740-i2s.c
@@ -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);
-- 
Sent by a computer through tubes

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

  parent reply	other threads:[~2019-10-04 21:44 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-04 21:43 [PATCH 00/10] Stop NULLifying match pointer in of_match_device() Stephen Boyd
2019-10-04 21:43 ` Stephen Boyd
2019-10-04 21:43 ` Stephen Boyd
2019-10-04 21:43 ` [PATCH 01/10] leds: pca953x: Use of_device_get_match_data() Stephen Boyd
2019-10-06 12:15   ` Jacek Anaszewski
2019-10-07  8:01   ` Geert Uytterhoeven
2019-10-13 12:10   ` Pavel Machek
2019-10-14 17:50   ` Andy Shevchenko
2019-10-14 20:54     ` Stephen Boyd
2019-10-15  9:02       ` Andy Shevchenko
2019-10-15 22:41         ` Stephen Boyd
2019-10-16 13:46           ` Andy Shevchenko
2019-11-04  9:09   ` Pavel Machek
2019-10-04 21:43 ` [PATCH 02/10] media: renesas-ceu: " Stephen Boyd
2019-10-09 12:54   ` Mauro Carvalho Chehab
2019-10-09 13:14     ` Jacopo Mondi
2019-10-04 21:43 ` [PATCH 03/10] rtc: armada38x: " Stephen Boyd
2019-10-07 13:53   ` Alexandre Belloni
2019-10-04 21:43 ` [PATCH 04/10] drivers: net: davinci_mdio: " Stephen Boyd
2019-10-04 21:43 ` [PATCH 05/10] serial: stm32: " Stephen Boyd
2019-10-05  6:53   ` Greg Kroah-Hartman
2019-10-04 21:43 ` [PATCH 06/10] usb: usb251xb: " Stephen Boyd
2019-10-05  6:53   ` Greg Kroah-Hartman
2019-10-04 21:43 ` Stephen Boyd [this message]
2019-10-04 21:43   ` [alsa-devel] [PATCH 07/10] ASoC: jz4740: " Stephen Boyd
2019-10-07 13:03   ` Applied "ASoC: jz4740: Use of_device_get_match_data()" to the asoc tree Mark Brown
2019-10-07 13:03     ` [alsa-devel] " Mark Brown
2019-10-04 21:43 ` [PATCH 08/10] spi: gpio: Look for a device node instead of match Stephen Boyd
2019-10-07 13:03   ` Applied "spi: gpio: Look for a device node instead of match" to the spi tree Mark Brown
2019-10-07 13:03     ` Mark Brown
2019-10-04 21:43 ` [PATCH 09/10] hwmon: (lm70) Avoid undefined reference to match table Stephen Boyd
2019-10-04 23:03   ` Guenter Roeck
2019-10-04 21:43 ` [PATCH 10/10] of/device: Don't NULLify match table in of_match_device() with CONFIG_OF=n Stephen Boyd
2019-10-17 17:47   ` Frank Rowand
2019-10-17 20:24     ` Rob Herring
2019-10-17 20:48       ` Stephen Boyd

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191004214334.149976-8-swboyd@chromium.org \
    --to=swboyd@chromium.org \
    --cc=alsa-devel@alsa-project.org \
    --cc=arnd@arndb.de \
    --cc=broonie@kernel.org \
    --cc=frowand.list@gmail.com \
    --cc=geert@linux-m68k.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=paul@crapouillou.net \
    --cc=perex@perex.cz \
    --cc=robh+dt@kernel.org \
    --cc=tiwai@suse.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.