mtd: rawnand: mtk: use of_device_get_match_data() (36bf2eb9) · Commits · 戴 / test

drivers/mtd/nand/raw/mtk_ecc.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -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];

+1 −9

Original line number	Diff line number	Diff line
		@@ -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);