mtd: rawnand: mtk: use of_device_get_match_data()

The usage of of_device_get_match_data() reduce the code size a bit.

Also, the only way to call .probe() is to match an entry in
.of_match_table[], so of_device_id cannot be NULL.

Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Reviewed-by: Xiaolei Li <xiaolei.li@mediatek.com>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>

diff --git a/drivers/mtd/nand/raw/mtk_ecc.c b/drivers/mtd/nand/raw/mtk_ecc.c
index 40d86a861a70de669ad0acf34898fb28820d65dd..6432bd70c3b3913a71442744ad122b727e12bc30 100644 (file)
--- a/drivers/mtd/nand/raw/mtk_ecc.c
+++ b/drivers/mtd/nand/raw/mtk_ecc.c
@@ -500,7 +500,6 @@ static int mtk_ecc_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct mtk_ecc *ecc;
        struct resource *res;
-       const struct of_device_id *of_ecc_id = NULL;
        u32 max_eccdata_size;
        int irq, ret;
 
@@ -508,11 +507,7 @@ static int mtk_ecc_probe(struct platform_device *pdev)
        if (!ecc)
                return -ENOMEM;
 
-       of_ecc_id = of_match_device(mtk_ecc_dt_match, &pdev->dev);
-       if (!of_ecc_id)
-               return -ENODEV;
-
-       ecc->caps = of_ecc_id->data;
+       ecc->caps = of_device_get_match_data(dev);
 
        max_eccdata_size = ecc->caps->num_ecc_strength - 1;
        max_eccdata_size = ecc->caps->ecc_strength[max_eccdata_size];

diff --git a/drivers/mtd/nand/raw/mtk_nand.c b/drivers/mtd/nand/raw/mtk_nand.c
index 6977da3a26aaf272fad4a1b93fd88401e703669f..75c845adb05016013e69789ee6bbd74a98d0d55b 100644 (file)
--- a/drivers/mtd/nand/raw/mtk_nand.c
+++ b/drivers/mtd/nand/raw/mtk_nand.c
@@ -1434,7 +1434,6 @@ static int mtk_nfc_probe(struct platform_device *pdev)
        struct device_node *np = dev->of_node;
        struct mtk_nfc *nfc;
        struct resource *res;
-       const struct of_device_id *of_nfc_id = NULL;
        int ret, irq;
 
        nfc = devm_kzalloc(dev, sizeof(*nfc), GFP_KERNEL);
@@ -1452,6 +1451,7 @@ static int mtk_nfc_probe(struct platform_device *pdev)
        else if (!nfc->ecc)
                return -ENODEV;
 
+       nfc->caps = of_device_get_match_data(dev);
        nfc->dev = dev;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -1498,14 +1498,6 @@ static int mtk_nfc_probe(struct platform_device *pdev)
                goto clk_disable;
        }
 
-       of_nfc_id = of_match_device(mtk_nfc_id_table, &pdev->dev);
-       if (!of_nfc_id) {
-               ret = -ENODEV;
-               goto clk_disable;
-       }
-
-       nfc->caps = of_nfc_id->data;
-
        platform_set_drvdata(pdev, nfc);
 
        ret = mtk_nfc_nand_chips_init(dev, nfc);