From: Mark Brown <broonie@kernel.org> To: Stephen Boyd <swboyd@chromium.org> Cc: Arnd Bergmann <arnd@arndb.de>, Frank Rowand <frowand.list@gmail.com>, Geert Uytterhoeven <geert@linux-m68k.org>, linux-kernel@vger.kernel.org, <linux-spi@vger.kernel.org>, linux-spi@vger.kernel.org, Mark Brown <broonie@kernel.org>, Rob Herring <robh+dt@kernel.org> Subject: Applied "spi: gpio: Look for a device node instead of match" to the spi tree Date: Mon, 7 Oct 2019 14:03:29 +0100 (BST) [thread overview] Message-ID: <20191007130329.47D48274162F@ypsilon.sirena.org.uk> (raw) In-Reply-To: <20191004214334.149976-9-swboyd@chromium.org> The patch spi: gpio: Look for a device node instead of match has been applied to the spi tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-5.5 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From 62217f8b084a05dd2d84781a8ca065098df21ec7 Mon Sep 17 00:00:00 2001 From: Stephen Boyd <swboyd@chromium.org> Date: Fri, 4 Oct 2019 14:43:32 -0700 Subject: [PATCH] spi: gpio: Look for a device node instead of match This driver doesn't do anything with the match for the device node. The logic is the same as looking to see if a device node exists or not because this driver wouldn't probe unless there is a device node match when the device is created from DT. Just test for the presence of the device node to simplify and avoid referencing a potentially undefined match table when CONFIG_OF=n. Cc: Arnd Bergmann <arnd@arndb.de> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Mark Brown <broonie@kernel.org> Cc: Rob Herring <robh+dt@kernel.org> Cc: Frank Rowand <frowand.list@gmail.com> Cc: <linux-spi@vger.kernel.org> Signed-off-by: Stephen Boyd <swboyd@chromium.org> Link: https://lore.kernel.org/r/20191004214334.149976-9-swboyd@chromium.org Signed-off-by: Mark Brown <broonie@kernel.org> --- drivers/spi/spi-gpio.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c index 1d3e23ec20a6..42f4d82e9c5a 100644 --- a/drivers/spi/spi-gpio.c +++ b/drivers/spi/spi-gpio.c @@ -362,9 +362,6 @@ static int spi_gpio_probe(struct platform_device *pdev) struct spi_gpio *spi_gpio; struct device *dev = &pdev->dev; struct spi_bitbang *bb; - const struct of_device_id *of_id; - - of_id = of_match_device(spi_gpio_dt_ids, &pdev->dev); master = spi_alloc_master(dev, sizeof(*spi_gpio)); if (!master) @@ -374,7 +371,7 @@ static int spi_gpio_probe(struct platform_device *pdev) if (status) return status; - if (of_id) + if (pdev->dev.of_node) status = spi_gpio_probe_dt(pdev, master); else status = spi_gpio_probe_pdata(pdev, master); -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Mark Brown <broonie@kernel.org> To: Stephen Boyd <swboyd@chromium.org> Cc: Arnd Bergmann <arnd@arndb.de>, Frank Rowand <frowand.list@gmail.com>, Geert Uytterhoeven <geert@linux-m68k.org>, linux-kernel@vger.kernel.org, <linux-spi@vger.kernel.org>, linux-spi@vger.kernel.org, Mark Brown <broonie@kernel.org>, Rob Herring <robh+dt@kernel.org> Subject: Applied "spi: gpio: Look for a device node instead of match" to the spi tree Date: Mon, 7 Oct 2019 14:03:29 +0100 (BST) [thread overview] Message-ID: <20191007130329.47D48274162F@ypsilon.sirena.org.uk> (raw) In-Reply-To: <20191004214334.149976-9-swboyd@chromium.org> The patch spi: gpio: Look for a device node instead of match has been applied to the spi tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-5.5 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 62217f8b084a05dd2d84781a8ca065098df21ec7 Mon Sep 17 00:00:00 2001 From: Stephen Boyd <swboyd@chromium.org> Date: Fri, 4 Oct 2019 14:43:32 -0700 Subject: [PATCH] spi: gpio: Look for a device node instead of match This driver doesn't do anything with the match for the device node. The logic is the same as looking to see if a device node exists or not because this driver wouldn't probe unless there is a device node match when the device is created from DT. Just test for the presence of the device node to simplify and avoid referencing a potentially undefined match table when CONFIG_OF=n. Cc: Arnd Bergmann <arnd@arndb.de> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Mark Brown <broonie@kernel.org> Cc: Rob Herring <robh+dt@kernel.org> Cc: Frank Rowand <frowand.list@gmail.com> Cc: <linux-spi@vger.kernel.org> Signed-off-by: Stephen Boyd <swboyd@chromium.org> Link: https://lore.kernel.org/r/20191004214334.149976-9-swboyd@chromium.org Signed-off-by: Mark Brown <broonie@kernel.org> --- drivers/spi/spi-gpio.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c index 1d3e23ec20a6..42f4d82e9c5a 100644 --- a/drivers/spi/spi-gpio.c +++ b/drivers/spi/spi-gpio.c @@ -362,9 +362,6 @@ static int spi_gpio_probe(struct platform_device *pdev) struct spi_gpio *spi_gpio; struct device *dev = &pdev->dev; struct spi_bitbang *bb; - const struct of_device_id *of_id; - - of_id = of_match_device(spi_gpio_dt_ids, &pdev->dev); master = spi_alloc_master(dev, sizeof(*spi_gpio)); if (!master) @@ -374,7 +371,7 @@ static int spi_gpio_probe(struct platform_device *pdev) if (status) return status; - if (of_id) + if (pdev->dev.of_node) status = spi_gpio_probe_dt(pdev, master); else status = spi_gpio_probe_pdata(pdev, master); -- 2.20.1
next prev parent reply other threads:[~2019-10-07 13:03 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 ` [PATCH 07/10] ASoC: jz4740: " Stephen Boyd 2019-10-04 21:43 ` [alsa-devel] " 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 ` Mark Brown [this message] 2019-10-07 13:03 ` Applied "spi: gpio: Look for a device node instead of match" to the spi tree 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=20191007130329.47D48274162F@ypsilon.sirena.org.uk \ --to=broonie@kernel.org \ --cc=arnd@arndb.de \ --cc=frowand.list@gmail.com \ --cc=geert@linux-m68k.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-spi@vger.kernel.org \ --cc=robh+dt@kernel.org \ --cc=swboyd@chromium.org \ /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: linkBe 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.