[PATCH] spi: mediatek: Use of_device_get_match_data()
Ryder Lee
ryder.lee at mediatek.com
Sun Apr 15 19:33:00 PDT 2018
The usage of of_device_get_match_data() reduce the code size a bit.
Also, the only way to call mtk_spi_probe() is to match an entry in
mtk_spi_of_match[], so of_id cannot be NULL.
Signed-off-by: Ryder Lee <ryder.lee at mediatek.com>
---
drivers/spi/spi-mt65xx.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c
index 86bf456..3edc183 100644
--- a/drivers/spi/spi-mt65xx.c
+++ b/drivers/spi/spi-mt65xx.c
@@ -20,6 +20,7 @@
#include <linux/ioport.h>
#include <linux/module.h>
#include <linux/of.h>
+#include <linux/of_device.h>
#include <linux/of_gpio.h>
#include <linux/platform_device.h>
#include <linux/platform_data/spi-mt65xx.h>
@@ -578,7 +579,6 @@ static int mtk_spi_probe(struct platform_device *pdev)
{
struct spi_master *master;
struct mtk_spi *mdata;
- const struct of_device_id *of_id;
struct resource *res;
int i, irq, ret;
@@ -598,15 +598,9 @@ static int mtk_spi_probe(struct platform_device *pdev)
master->can_dma = mtk_spi_can_dma;
master->setup = mtk_spi_setup;
- of_id = of_match_node(mtk_spi_of_match, pdev->dev.of_node);
- if (!of_id) {
- dev_err(&pdev->dev, "failed to probe of_node\n");
- ret = -EINVAL;
- goto err_put_master;
- }
-
mdata = spi_master_get_devdata(master);
- mdata->dev_comp = of_id->data;
+ mdata->dev_comp = of_device_get_match_data(&pdev->dev);
+
if (mdata->dev_comp->must_tx)
master->flags = SPI_MASTER_MUST_TX;
--
1.9.1
More information about the linux-arm-kernel
mailing list