| Message ID | 20220702140130.218409-5-biju.das.jz@bp.renesas.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Add support for RZ/N1 SJA1000 CAN controller | expand |
On 02.07.2022 15:01:28, Biju Das wrote: > This patch replaces of_match_device->of_device_get_match_data > to get pointer to device data. > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> > --- > drivers/net/can/sja1000/sja1000_platform.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/can/sja1000/sja1000_platform.c b/drivers/net/can/sja1000/sja1000_platform.c > index f9ec7bd8dfac..24ea0f76e130 100644 > --- a/drivers/net/can/sja1000/sja1000_platform.c > +++ b/drivers/net/can/sja1000/sja1000_platform.c > @@ -210,7 +210,6 @@ static int sp_probe(struct platform_device *pdev) > struct resource *res_mem, *res_irq = NULL; > struct sja1000_platform_data *pdata; > struct device_node *of = pdev->dev.of_node; > - const struct of_device_id *of_id; > const struct sja1000_of_data *of_data = NULL; > size_t priv_sz = 0; > > @@ -243,11 +242,9 @@ static int sp_probe(struct platform_device *pdev) > return -ENODEV; > } > > - of_id = of_match_device(sp_of_table, &pdev->dev); > - if (of_id && of_id->data) { > - of_data = of_id->data; > + of_data = of_device_get_match_data(&pdev->dev); Can you use device_get_match_data() instead? Marc
Hi Marc, Thanks for the feedback. > Subject: Re: [PATCH 4/6] can: sja1000: Use of_device_get_match_data to > get device data > > On 02.07.2022 15:01:28, Biju Das wrote: > > This patch replaces of_match_device->of_device_get_match_data > > to get pointer to device data. > > > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> > > --- > > drivers/net/can/sja1000/sja1000_platform.c | 7 ++----- > > 1 file changed, 2 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/net/can/sja1000/sja1000_platform.c > b/drivers/net/can/sja1000/sja1000_platform.c > > index f9ec7bd8dfac..24ea0f76e130 100644 > > --- a/drivers/net/can/sja1000/sja1000_platform.c > > +++ b/drivers/net/can/sja1000/sja1000_platform.c > > @@ -210,7 +210,6 @@ static int sp_probe(struct platform_device *pdev) > > struct resource *res_mem, *res_irq = NULL; > > struct sja1000_platform_data *pdata; > > struct device_node *of = pdev->dev.of_node; > > - const struct of_device_id *of_id; > > const struct sja1000_of_data *of_data = NULL; > > size_t priv_sz = 0; > > > > @@ -243,11 +242,9 @@ static int sp_probe(struct platform_device *pdev) > > return -ENODEV; > > } > > > > - of_id = of_match_device(sp_of_table, &pdev->dev); > > - if (of_id && of_id->data) { > > - of_data = of_id->data; > > + of_data = of_device_get_match_data(&pdev->dev); > > Can you use device_get_match_data() instead? Agreed, Will use device_get_match_data() Cheers, Biju
diff --git a/drivers/net/can/sja1000/sja1000_platform.c b/drivers/net/can/sja1000/sja1000_platform.c index f9ec7bd8dfac..24ea0f76e130 100644 --- a/drivers/net/can/sja1000/sja1000_platform.c +++ b/drivers/net/can/sja1000/sja1000_platform.c @@ -210,7 +210,6 @@ static int sp_probe(struct platform_device *pdev) struct resource *res_mem, *res_irq = NULL; struct sja1000_platform_data *pdata; struct device_node *of = pdev->dev.of_node; - const struct of_device_id *of_id; const struct sja1000_of_data *of_data = NULL; size_t priv_sz = 0; @@ -243,11 +242,9 @@ static int sp_probe(struct platform_device *pdev) return -ENODEV; } - of_id = of_match_device(sp_of_table, &pdev->dev); - if (of_id && of_id->data) { - of_data = of_id->data; + of_data = of_device_get_match_data(&pdev->dev); + if (of_data) priv_sz = of_data->priv_sz; - } dev = alloc_sja1000dev(priv_sz); if (!dev)
This patch replaces of_match_device->of_device_get_match_data to get pointer to device data. Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> --- drivers/net/can/sja1000/sja1000_platform.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)