]> Git Repo - J-linux.git/commitdiff
spi: gpio: Look for a device node instead of match
authorStephen Boyd <[email protected]>
Fri, 4 Oct 2019 21:43:32 +0000 (14:43 -0700)
committerMark Brown <[email protected]>
Mon, 7 Oct 2019 12:55:40 +0000 (13:55 +0100)
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 <[email protected]>
Cc: Geert Uytterhoeven <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Frank Rowand <[email protected]>
Cc: <[email protected]>
Signed-off-by: Stephen Boyd <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Mark Brown <[email protected]>
drivers/spi/spi-gpio.c

index 1d3e23ec20a61fd926d29585fbd29d4d9d9d1593..42f4d82e9c5ab42569a1d8af46e4e7801f59d924 100644 (file)
@@ -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);
This page took 0.052651 seconds and 4 git commands to generate.