* Re: [PATCH] mtd: nand: mtk: use of_device_get_match_data()
2018-04-16 2:33 ` [PATCH] mtd: nand: mtk: use of_device_get_match_data() Ryder Lee
@ 2018-04-16 4:27 ` xiaolei li
2018-04-22 17:27 ` Boris Brezillon
1 sibling, 0 replies; 3+ messages in thread
From: xiaolei li @ 2018-04-16 4:27 UTC (permalink / raw)
To: Ryder Lee
Cc: Boris Brezillon, linux-mtd, linux-kernel, linux-arm-kernel,
linux-mediatek
On Mon, 2018-04-16 at 10:33 +0800, Ryder Lee wrote:
> 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>
> ---
> drivers/mtd/nand/raw/mtk_ecc.c | 7 +------
> drivers/mtd/nand/raw/mtk_nand.c | 10 +---------
> 2 files changed, 2 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/mtd/nand/mtk_ecc.c b/drivers/mtd/nand/mtk_ecc.c
> index 40d86a8..6432bd7 100644
> --- 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);
>
Thanks.
Reviewed-by: Xiaolei Li <xiaolei.li@mediatek.com>
> 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/mtk_nand.c b/drivers/mtd/nand/mtk_nand.c
> index 6977da3..75c845a 100644
> --- 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);
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] mtd: nand: mtk: use of_device_get_match_data()
2018-04-16 2:33 ` [PATCH] mtd: nand: mtk: use of_device_get_match_data() Ryder Lee
2018-04-16 4:27 ` xiaolei li
@ 2018-04-22 17:27 ` Boris Brezillon
1 sibling, 0 replies; 3+ messages in thread
From: Boris Brezillon @ 2018-04-22 17:27 UTC (permalink / raw)
To: Ryder Lee
Cc: Boris Brezillon, linux-kernel, linux-mediatek, linux-mtd,
Xiaolei Li, linux-arm-kernel
On Mon, 16 Apr 2018 10:33:54 +0800
Ryder Lee <ryder.lee@mediatek.com> wrote:
> 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>
> ---
> drivers/mtd/nand/raw/mtk_ecc.c | 7 +------
> drivers/mtd/nand/raw/mtk_nand.c | 10 +---------
Applied to nand/next after fixing the subject prefix.
Thanks,
Boris
> 2 files changed, 2 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/mtd/nand/mtk_ecc.c b/drivers/mtd/nand/mtk_ecc.c
> index 40d86a8..6432bd7 100644
> --- 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/mtk_nand.c b/drivers/mtd/nand/mtk_nand.c
> index 6977da3..75c845a 100644
> --- 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);
^ permalink raw reply [flat|nested] 3+ messages in thread