| Message ID | 20210823113338.3568-4-tangbin@cmss.chinamobile.com |
|---|---|
| State | New |
| Headers | show |
| Series | net: Use of_device_get_match_data to simplify code | expand |
On 23.08.2021 19:33:38, Tang Bin wrote: > Retrieve OF match data, it's better and cleaner to use > 'of_device_get_match_data' over 'of_match_device'. > > Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com> Thanks for the patch! LGTM, comment inside. > --- > drivers/net/can/mscan/mpc5xxx_can.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c > index e254e04ae..3b7465acd 100644 > --- a/drivers/net/can/mscan/mpc5xxx_can.c > +++ b/drivers/net/can/mscan/mpc5xxx_can.c > @@ -279,7 +279,6 @@ static u32 mpc512x_can_get_clock(struct platform_device *ofdev, > static const struct of_device_id mpc5xxx_can_table[]; > static int mpc5xxx_can_probe(struct platform_device *ofdev) > { > - const struct of_device_id *match; > const struct mpc5xxx_can_data *data; > struct device_node *np = ofdev->dev.of_node; > struct net_device *dev; > @@ -289,10 +288,9 @@ static int mpc5xxx_can_probe(struct platform_device *ofdev) > int irq, mscan_clksrc = 0; > int err = -ENOMEM; > > - match = of_match_device(mpc5xxx_can_table, &ofdev->dev); > - if (!match) > + data = of_device_get_match_data(&ofdev->dev); > + if (!data) > return -EINVAL; Please remove the "BUG_ON(!data)", which comes later. > - data = match->data; > > base = of_iomap(np, 0); > if (!base) { > -- > 2.20.1.windows.1 > > > > regards, Marc
diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c index e254e04ae..3b7465acd 100644 --- a/drivers/net/can/mscan/mpc5xxx_can.c +++ b/drivers/net/can/mscan/mpc5xxx_can.c @@ -279,7 +279,6 @@ static u32 mpc512x_can_get_clock(struct platform_device *ofdev, static const struct of_device_id mpc5xxx_can_table[]; static int mpc5xxx_can_probe(struct platform_device *ofdev) { - const struct of_device_id *match; const struct mpc5xxx_can_data *data; struct device_node *np = ofdev->dev.of_node; struct net_device *dev; @@ -289,10 +288,9 @@ static int mpc5xxx_can_probe(struct platform_device *ofdev) int irq, mscan_clksrc = 0; int err = -ENOMEM; - match = of_match_device(mpc5xxx_can_table, &ofdev->dev); - if (!match) + data = of_device_get_match_data(&ofdev->dev); + if (!data) return -EINVAL; - data = match->data; base = of_iomap(np, 0); if (!base) {
Retrieve OF match data, it's better and cleaner to use 'of_device_get_match_data' over 'of_match_device'. Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com> --- drivers/net/can/mscan/mpc5xxx_can.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)