* [PATCH v2] memory: mtk-smi: Use of_device_get_match_data helper
@ 2017-07-26 12:37 ` honghui.zhang-NuS5LvNUpcJWk0Htik3J/w
0 siblings, 0 replies; 9+ messages in thread
From: honghui.zhang at mediatek.com @ 2017-07-26 12:37 UTC (permalink / raw)
To: linux-arm-kernel
From: Honghui Zhang <honghui.zhang@mediatek.com>
Replace custom code with generic helper to retrieve driver data.
Signed-off-by: Honghui Zhang <honghui.zhang@mediatek.com>
---
drivers/memory/mtk-smi.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/drivers/memory/mtk-smi.c b/drivers/memory/mtk-smi.c
index 4afbc41..2b798bb4 100644
--- a/drivers/memory/mtk-smi.c
+++ b/drivers/memory/mtk-smi.c
@@ -240,20 +240,15 @@ static int mtk_smi_larb_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct device_node *smi_node;
struct platform_device *smi_pdev;
- const struct of_device_id *of_id;
if (!dev->pm_domain)
return -EPROBE_DEFER;
- of_id = of_match_node(mtk_smi_larb_of_ids, pdev->dev.of_node);
- if (!of_id)
- return -EINVAL;
-
larb = devm_kzalloc(dev, sizeof(*larb), GFP_KERNEL);
if (!larb)
return -ENOMEM;
- larb->larb_gen = of_id->data;
+ larb->larb_gen = of_device_get_match_data(dev);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
larb->base = devm_ioremap_resource(dev, res);
if (IS_ERR(larb->base))
@@ -319,7 +314,6 @@ static int mtk_smi_common_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct mtk_smi *common;
struct resource *res;
- const struct of_device_id *of_id;
enum mtk_smi_gen smi_gen;
if (!dev->pm_domain)
@@ -338,17 +332,13 @@ static int mtk_smi_common_probe(struct platform_device *pdev)
if (IS_ERR(common->clk_smi))
return PTR_ERR(common->clk_smi);
- of_id = of_match_node(mtk_smi_common_of_ids, pdev->dev.of_node);
- if (!of_id)
- return -EINVAL;
-
/*
* for mtk smi gen 1, we need to get the ao(always on) base to config
* m4u port, and we need to enable the aync clock for transform the smi
* clock into emi clock domain, but for mtk smi gen2, there's no smi ao
* base.
*/
- smi_gen = (enum mtk_smi_gen)of_id->data;
+ smi_gen = (enum mtk_smi_gen)of_device_get_match_data(dev);
if (smi_gen == MTK_SMI_GEN1) {
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
common->smi_ao_base = devm_ioremap_resource(dev, res);
--
2.6.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2] memory: mtk-smi: Use of_device_get_match_data helper
@ 2017-07-26 12:37 ` honghui.zhang-NuS5LvNUpcJWk0Htik3J/w
0 siblings, 0 replies; 9+ messages in thread
From: honghui.zhang-NuS5LvNUpcJWk0Htik3J/w @ 2017-07-26 12:37 UTC (permalink / raw)
To: joro-zLv9SwRftAIdnm+yROfE0A, matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w,
robh-DgEjT+Ai2ygdnm+yROfE0A, robin.murphy-5wv7dgnIgG8
Cc: youlin.pei-NuS5LvNUpcJWk0Htik3J/w,
srv_heupstream-NuS5LvNUpcJWk0Htik3J/w,
catalin.marinas-5wv7dgnIgG8, erin.lo-NuS5LvNUpcJWk0Htik3J/w,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
From: Honghui Zhang <honghui.zhang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
Replace custom code with generic helper to retrieve driver data.
Signed-off-by: Honghui Zhang <honghui.zhang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
---
drivers/memory/mtk-smi.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/drivers/memory/mtk-smi.c b/drivers/memory/mtk-smi.c
index 4afbc41..2b798bb4 100644
--- a/drivers/memory/mtk-smi.c
+++ b/drivers/memory/mtk-smi.c
@@ -240,20 +240,15 @@ static int mtk_smi_larb_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct device_node *smi_node;
struct platform_device *smi_pdev;
- const struct of_device_id *of_id;
if (!dev->pm_domain)
return -EPROBE_DEFER;
- of_id = of_match_node(mtk_smi_larb_of_ids, pdev->dev.of_node);
- if (!of_id)
- return -EINVAL;
-
larb = devm_kzalloc(dev, sizeof(*larb), GFP_KERNEL);
if (!larb)
return -ENOMEM;
- larb->larb_gen = of_id->data;
+ larb->larb_gen = of_device_get_match_data(dev);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
larb->base = devm_ioremap_resource(dev, res);
if (IS_ERR(larb->base))
@@ -319,7 +314,6 @@ static int mtk_smi_common_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct mtk_smi *common;
struct resource *res;
- const struct of_device_id *of_id;
enum mtk_smi_gen smi_gen;
if (!dev->pm_domain)
@@ -338,17 +332,13 @@ static int mtk_smi_common_probe(struct platform_device *pdev)
if (IS_ERR(common->clk_smi))
return PTR_ERR(common->clk_smi);
- of_id = of_match_node(mtk_smi_common_of_ids, pdev->dev.of_node);
- if (!of_id)
- return -EINVAL;
-
/*
* for mtk smi gen 1, we need to get the ao(always on) base to config
* m4u port, and we need to enable the aync clock for transform the smi
* clock into emi clock domain, but for mtk smi gen2, there's no smi ao
* base.
*/
- smi_gen = (enum mtk_smi_gen)of_id->data;
+ smi_gen = (enum mtk_smi_gen)of_device_get_match_data(dev);
if (smi_gen == MTK_SMI_GEN1) {
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
common->smi_ao_base = devm_ioremap_resource(dev, res);
--
2.6.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2] memory: mtk-smi: Use of_device_get_match_data helper
@ 2017-08-02 2:02 ` Honghui Zhang
0 siblings, 0 replies; 9+ messages in thread
From: Honghui Zhang @ 2017-08-02 2:02 UTC (permalink / raw)
To: joro, jroedel
Cc: matthias.bgg, robh, robin.murphy, srv_heupstream,
catalin.marinas, linux-kernel, iommu, linux-mediatek,
linux-arm-kernel, youlin.pei, erin.lo
On Wed, 2017-07-26 at 20:37 +0800, honghui.zhang@mediatek.com wrote:
> From: Honghui Zhang <honghui.zhang@mediatek.com>
>
> Replace custom code with generic helper to retrieve driver data.
Hi, Joerg, would you please take this one, because my last
patch[1]([patch v2 0/3] Add larbid init routine for mediatek's gen1 smi
larb driver) was base on this patch. Or should I put this one together
with the last patchset[1] and resend it with Matthias's reviewed-by
tag[2]?
[1]https://www.spinics.net/lists/arm-kernel/msg596629.html
[2]https://lkml.org/lkml/2017/7/31/197
thanks
>
> Signed-off-by: Honghui Zhang <honghui.zhang@mediatek.com>
> ---
> drivers/memory/mtk-smi.c | 14 ++------------
> 1 file changed, 2 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/memory/mtk-smi.c b/drivers/memory/mtk-smi.c
> index 4afbc41..2b798bb4 100644
> --- a/drivers/memory/mtk-smi.c
> +++ b/drivers/memory/mtk-smi.c
> @@ -240,20 +240,15 @@ static int mtk_smi_larb_probe(struct platform_device *pdev)
> struct device *dev = &pdev->dev;
> struct device_node *smi_node;
> struct platform_device *smi_pdev;
> - const struct of_device_id *of_id;
>
> if (!dev->pm_domain)
> return -EPROBE_DEFER;
>
> - of_id = of_match_node(mtk_smi_larb_of_ids, pdev->dev.of_node);
> - if (!of_id)
> - return -EINVAL;
> -
> larb = devm_kzalloc(dev, sizeof(*larb), GFP_KERNEL);
> if (!larb)
> return -ENOMEM;
>
> - larb->larb_gen = of_id->data;
> + larb->larb_gen = of_device_get_match_data(dev);
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> larb->base = devm_ioremap_resource(dev, res);
> if (IS_ERR(larb->base))
> @@ -319,7 +314,6 @@ static int mtk_smi_common_probe(struct platform_device *pdev)
> struct device *dev = &pdev->dev;
> struct mtk_smi *common;
> struct resource *res;
> - const struct of_device_id *of_id;
> enum mtk_smi_gen smi_gen;
>
> if (!dev->pm_domain)
> @@ -338,17 +332,13 @@ static int mtk_smi_common_probe(struct platform_device *pdev)
> if (IS_ERR(common->clk_smi))
> return PTR_ERR(common->clk_smi);
>
> - of_id = of_match_node(mtk_smi_common_of_ids, pdev->dev.of_node);
> - if (!of_id)
> - return -EINVAL;
> -
> /*
> * for mtk smi gen 1, we need to get the ao(always on) base to config
> * m4u port, and we need to enable the aync clock for transform the smi
> * clock into emi clock domain, but for mtk smi gen2, there's no smi ao
> * base.
> */
> - smi_gen = (enum mtk_smi_gen)of_id->data;
> + smi_gen = (enum mtk_smi_gen)of_device_get_match_data(dev);
> if (smi_gen == MTK_SMI_GEN1) {
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> common->smi_ao_base = devm_ioremap_resource(dev, res);
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v2] memory: mtk-smi: Use of_device_get_match_data helper
@ 2017-08-02 2:02 ` Honghui Zhang
0 siblings, 0 replies; 9+ messages in thread
From: Honghui Zhang @ 2017-08-02 2:02 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, 2017-07-26 at 20:37 +0800, honghui.zhang at mediatek.com wrote:
> From: Honghui Zhang <honghui.zhang@mediatek.com>
>
> Replace custom code with generic helper to retrieve driver data.
Hi, Joerg, would you please take this one, because my last
patch[1]([patch v2 0/3] Add larbid init routine for mediatek's gen1 smi
larb driver) was base on this patch. Or should I put this one together
with the last patchset[1] and resend it with Matthias's reviewed-by
tag[2]?
[1]https://www.spinics.net/lists/arm-kernel/msg596629.html
[2]https://lkml.org/lkml/2017/7/31/197
thanks
>
> Signed-off-by: Honghui Zhang <honghui.zhang@mediatek.com>
> ---
> drivers/memory/mtk-smi.c | 14 ++------------
> 1 file changed, 2 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/memory/mtk-smi.c b/drivers/memory/mtk-smi.c
> index 4afbc41..2b798bb4 100644
> --- a/drivers/memory/mtk-smi.c
> +++ b/drivers/memory/mtk-smi.c
> @@ -240,20 +240,15 @@ static int mtk_smi_larb_probe(struct platform_device *pdev)
> struct device *dev = &pdev->dev;
> struct device_node *smi_node;
> struct platform_device *smi_pdev;
> - const struct of_device_id *of_id;
>
> if (!dev->pm_domain)
> return -EPROBE_DEFER;
>
> - of_id = of_match_node(mtk_smi_larb_of_ids, pdev->dev.of_node);
> - if (!of_id)
> - return -EINVAL;
> -
> larb = devm_kzalloc(dev, sizeof(*larb), GFP_KERNEL);
> if (!larb)
> return -ENOMEM;
>
> - larb->larb_gen = of_id->data;
> + larb->larb_gen = of_device_get_match_data(dev);
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> larb->base = devm_ioremap_resource(dev, res);
> if (IS_ERR(larb->base))
> @@ -319,7 +314,6 @@ static int mtk_smi_common_probe(struct platform_device *pdev)
> struct device *dev = &pdev->dev;
> struct mtk_smi *common;
> struct resource *res;
> - const struct of_device_id *of_id;
> enum mtk_smi_gen smi_gen;
>
> if (!dev->pm_domain)
> @@ -338,17 +332,13 @@ static int mtk_smi_common_probe(struct platform_device *pdev)
> if (IS_ERR(common->clk_smi))
> return PTR_ERR(common->clk_smi);
>
> - of_id = of_match_node(mtk_smi_common_of_ids, pdev->dev.of_node);
> - if (!of_id)
> - return -EINVAL;
> -
> /*
> * for mtk smi gen 1, we need to get the ao(always on) base to config
> * m4u port, and we need to enable the aync clock for transform the smi
> * clock into emi clock domain, but for mtk smi gen2, there's no smi ao
> * base.
> */
> - smi_gen = (enum mtk_smi_gen)of_id->data;
> + smi_gen = (enum mtk_smi_gen)of_device_get_match_data(dev);
> if (smi_gen == MTK_SMI_GEN1) {
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> common->smi_ao_base = devm_ioremap_resource(dev, res);
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2] memory: mtk-smi: Use of_device_get_match_data helper
@ 2017-08-02 2:02 ` Honghui Zhang
0 siblings, 0 replies; 9+ messages in thread
From: Honghui Zhang @ 2017-08-02 2:02 UTC (permalink / raw)
To: joro-zLv9SwRftAIdnm+yROfE0A, jroedel-l3A5Bk7waGM
Cc: youlin.pei-NuS5LvNUpcJWk0Htik3J/w, robh-DgEjT+Ai2ygdnm+yROfE0A,
srv_heupstream-NuS5LvNUpcJWk0Htik3J/w,
catalin.marinas-5wv7dgnIgG8, erin.lo-NuS5LvNUpcJWk0Htik3J/w,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
On Wed, 2017-07-26 at 20:37 +0800, honghui.zhang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org wrote:
> From: Honghui Zhang <honghui.zhang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
>
> Replace custom code with generic helper to retrieve driver data.
Hi, Joerg, would you please take this one, because my last
patch[1]([patch v2 0/3] Add larbid init routine for mediatek's gen1 smi
larb driver) was base on this patch. Or should I put this one together
with the last patchset[1] and resend it with Matthias's reviewed-by
tag[2]?
[1]https://www.spinics.net/lists/arm-kernel/msg596629.html
[2]https://lkml.org/lkml/2017/7/31/197
thanks
>
> Signed-off-by: Honghui Zhang <honghui.zhang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
> ---
> drivers/memory/mtk-smi.c | 14 ++------------
> 1 file changed, 2 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/memory/mtk-smi.c b/drivers/memory/mtk-smi.c
> index 4afbc41..2b798bb4 100644
> --- a/drivers/memory/mtk-smi.c
> +++ b/drivers/memory/mtk-smi.c
> @@ -240,20 +240,15 @@ static int mtk_smi_larb_probe(struct platform_device *pdev)
> struct device *dev = &pdev->dev;
> struct device_node *smi_node;
> struct platform_device *smi_pdev;
> - const struct of_device_id *of_id;
>
> if (!dev->pm_domain)
> return -EPROBE_DEFER;
>
> - of_id = of_match_node(mtk_smi_larb_of_ids, pdev->dev.of_node);
> - if (!of_id)
> - return -EINVAL;
> -
> larb = devm_kzalloc(dev, sizeof(*larb), GFP_KERNEL);
> if (!larb)
> return -ENOMEM;
>
> - larb->larb_gen = of_id->data;
> + larb->larb_gen = of_device_get_match_data(dev);
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> larb->base = devm_ioremap_resource(dev, res);
> if (IS_ERR(larb->base))
> @@ -319,7 +314,6 @@ static int mtk_smi_common_probe(struct platform_device *pdev)
> struct device *dev = &pdev->dev;
> struct mtk_smi *common;
> struct resource *res;
> - const struct of_device_id *of_id;
> enum mtk_smi_gen smi_gen;
>
> if (!dev->pm_domain)
> @@ -338,17 +332,13 @@ static int mtk_smi_common_probe(struct platform_device *pdev)
> if (IS_ERR(common->clk_smi))
> return PTR_ERR(common->clk_smi);
>
> - of_id = of_match_node(mtk_smi_common_of_ids, pdev->dev.of_node);
> - if (!of_id)
> - return -EINVAL;
> -
> /*
> * for mtk smi gen 1, we need to get the ao(always on) base to config
> * m4u port, and we need to enable the aync clock for transform the smi
> * clock into emi clock domain, but for mtk smi gen2, there's no smi ao
> * base.
> */
> - smi_gen = (enum mtk_smi_gen)of_id->data;
> + smi_gen = (enum mtk_smi_gen)of_device_get_match_data(dev);
> if (smi_gen == MTK_SMI_GEN1) {
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> common->smi_ao_base = devm_ioremap_resource(dev, res);
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2] memory: mtk-smi: Use of_device_get_match_data helper
2017-08-02 2:02 ` Honghui Zhang
(?)
@ 2017-08-04 9:44 ` Joerg Roedel
-1 siblings, 0 replies; 9+ messages in thread
From: Joerg Roedel @ 2017-08-04 9:44 UTC (permalink / raw)
To: Honghui Zhang
Cc: jroedel, matthias.bgg, robh, robin.murphy, srv_heupstream,
catalin.marinas, linux-kernel, iommu, linux-mediatek,
linux-arm-kernel, youlin.pei, erin.lo
On Wed, Aug 02, 2017 at 10:02:50AM +0800, Honghui Zhang wrote:
> On Wed, 2017-07-26 at 20:37 +0800, honghui.zhang@mediatek.com wrote:
> > From: Honghui Zhang <honghui.zhang@mediatek.com>
> >
> > Replace custom code with generic helper to retrieve driver data.
>
> Hi, Joerg, would you please take this one, because my last
> patch[1]([patch v2 0/3] Add larbid init routine for mediatek's gen1 smi
> larb driver) was base on this patch. Or should I put this one together
> with the last patchset[1] and resend it with Matthias's reviewed-by
> tag[2]?
Yes, please send everything together. That makes it more easy for me to
apply it.
Thanks,
Joerg
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2] memory: mtk-smi: Use of_device_get_match_data helper
@ 2017-08-04 9:44 ` Joerg Roedel
0 siblings, 0 replies; 9+ messages in thread
From: Joerg Roedel @ 2017-08-04 9:44 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Aug 02, 2017 at 10:02:50AM +0800, Honghui Zhang wrote:
> On Wed, 2017-07-26 at 20:37 +0800, honghui.zhang at mediatek.com wrote:
> > From: Honghui Zhang <honghui.zhang@mediatek.com>
> >
> > Replace custom code with generic helper to retrieve driver data.
>
> Hi, Joerg, would you please take this one, because my last
> patch[1]([patch v2 0/3] Add larbid init routine for mediatek's gen1 smi
> larb driver) was base on this patch. Or should I put this one together
> with the last patchset[1] and resend it with Matthias's reviewed-by
> tag[2]?
Yes, please send everything together. That makes it more easy for me to
apply it.
Thanks,
Joerg
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2] memory: mtk-smi: Use of_device_get_match_data helper
@ 2017-08-04 9:44 ` Joerg Roedel
0 siblings, 0 replies; 9+ messages in thread
From: Joerg Roedel @ 2017-08-04 9:44 UTC (permalink / raw)
To: Honghui Zhang
Cc: youlin.pei-NuS5LvNUpcJWk0Htik3J/w, robh-DgEjT+Ai2ygdnm+yROfE0A,
jroedel-l3A5Bk7waGM, srv_heupstream-NuS5LvNUpcJWk0Htik3J/w,
catalin.marinas-5wv7dgnIgG8, erin.lo-NuS5LvNUpcJWk0Htik3J/w,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
On Wed, Aug 02, 2017 at 10:02:50AM +0800, Honghui Zhang wrote:
> On Wed, 2017-07-26 at 20:37 +0800, honghui.zhang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org wrote:
> > From: Honghui Zhang <honghui.zhang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
> >
> > Replace custom code with generic helper to retrieve driver data.
>
> Hi, Joerg, would you please take this one, because my last
> patch[1]([patch v2 0/3] Add larbid init routine for mediatek's gen1 smi
> larb driver) was base on this patch. Or should I put this one together
> with the last patchset[1] and resend it with Matthias's reviewed-by
> tag[2]?
Yes, please send everything together. That makes it more easy for me to
apply it.
Thanks,
Joerg
^ permalink raw reply [flat|nested] 9+ messages in thread