From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Boyd Subject: [PATCH 08/10] spi: gpio: Look for a device node instead of match Date: Fri, 4 Oct 2019 14:43:32 -0700 Message-ID: <20191004214334.149976-9-swboyd@chromium.org> References: <20191004214334.149976-1-swboyd@chromium.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Cc: Arnd Bergmann , Geert Uytterhoeven , Mark Brown , Rob Herring , Frank Rowand , linux-spi@vger.kernel.org To: linux-kernel@vger.kernel.org Return-path: In-Reply-To: <20191004214334.149976-1-swboyd@chromium.org> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-spi.vger.kernel.org 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 Cc: Geert Uytterhoeven Cc: Mark Brown Cc: Rob Herring Cc: Frank Rowand Cc: Signed-off-by: Stephen Boyd --- Please ack or pick for immediate merge so the last patch can be merged. 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); -- Sent by a computer through tubes