diff options
| author | Mark Brown <[email protected]> | 2021-04-23 18:01:02 +0000 |
|---|---|---|
| committer | Mark Brown <[email protected]> | 2021-04-23 18:01:02 +0000 |
| commit | ffc9841d5200a484ea0ecc645157b4d7b873f3a6 (patch) | |
| tree | c5216df939963608cefcd94bdf2934a2b880b54d /drivers/spi/spi-imx.c | |
| parent | Merge remote-tracking branch 'asoc/for-5.12' into asoc-linus (diff) | |
| parent | ASoC: simple-card: Fix breakage on kontron-sl28-var3-ads2 (diff) | |
| download | kernel-ffc9841d5200a484ea0ecc645157b4d7b873f3a6.tar.gz kernel-ffc9841d5200a484ea0ecc645157b4d7b873f3a6.zip | |
Merge remote-tracking branch 'asoc/for-5.13' into asoc-next
Diffstat (limited to 'drivers/spi/spi-imx.c')
| -rw-r--r-- | drivers/spi/spi-imx.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index 5dc4ea4b4450..916580740e77 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -1548,13 +1548,12 @@ static int spi_imx_slave_abort(struct spi_master *master) static int spi_imx_probe(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; - const struct of_device_id *of_id = - of_match_device(spi_imx_dt_ids, &pdev->dev); struct spi_master *master; struct spi_imx_data *spi_imx; struct resource *res; int ret, irq, spi_drctl; - const struct spi_imx_devtype_data *devtype_data = of_id->data; + const struct spi_imx_devtype_data *devtype_data = + of_device_get_match_data(&pdev->dev); bool slave_mode; u32 val; |