Merge branch 'for-5.4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...
[sfrench/cifs-2.6.git] / drivers / spi / spi-gpio.c
index f9c5bbb747142559be6700281dc56b958179a27b..7ceb0ba27b755ce2b7250798b7b37c33c9d60b92 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)
@@ -376,7 +373,7 @@ static int spi_gpio_probe(struct platform_device *pdev)
                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);