net: can: use platform_{get,set}_drvdata()
Subsystems (3)
PATCH 1/1 net: can: use platform_{get,set}_drvdata()
Use the wrapper functions for getting and setting the driver data using platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev, so we can directly pass a struct platform_device.
Also, unnecessary dev_set_drvdata() is removed, because the driver core clears the driver data to NULL after device_release or on probe failure.
--- drivers/net/can/bfin_can.c | 10 ++++------ drivers/net/can/cc770/cc770_isa.c | 5 ++--- drivers/net/can/cc770/cc770_platform.c | 4 ++-- drivers/net/can/grcan.c | 5 ++--- drivers/net/can/mscan/mpc5xxx_can.c | 10 ++++------ drivers/net/can/sja1000/sja1000_isa.c | 5 ++--- drivers/net/can/sja1000/sja1000_of_platform.c | 6 ++---- drivers/net/can/sja1000/sja1000_platform.c | 5 ++--- 8 files changed, 20 insertions(+), 30 deletions(-)
drivers/net/can/bfin_can.c +4 -6
@@ -580,7 +580,7 @@ static int bfin_can_probe(struct platform_device *pdev) priv->pin_list = pdata; priv->can.clock.freq =get_sclk (); -dev_set_drvdata (&pdev->dev, dev); +platform_set_drvdata (pdev, dev);SET_NETDEV_DEV (dev, &pdev->dev); dev->flags |=IFF_ECHO ;/* we support local echo */
@@ -613,7 +613,7 @@ exit:static int bfin_can_remove (struct platform_device *pdev) { -struct net_device *dev =dev_get_drvdata (&pdev->dev); +struct net_device *dev =platform_get_drvdata (pdev);struct bfin_can_priv *priv =netdev_priv (dev);struct resource *res;
@@ -621,8 +621,6 @@ static int bfin_can_remove(struct platform_device *pdev)unregister_candev (dev); -dev_set_drvdata (&pdev->dev,NULL ); - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );release_mem_region (res->start,resource_size (res));
@@ -635,7 +633,7 @@ static int bfin_can_remove(struct platform_device *pdev)#ifdef CONFIG_PM static int bfin_can_suspend (struct platform_device *pdev,pm_message_t mesg) { -struct net_device *dev =dev_get_drvdata (&pdev->dev); +struct net_device *dev =platform_get_drvdata (pdev);struct bfin_can_priv *priv =netdev_priv (dev);struct bfin_can_regs __iomem *reg = priv->membase;int timeout =BFIN_CAN_TIMEOUT ;
@@ -658,7 +656,7 @@ static int bfin_can_suspend(struct platform_device *pdev, pm_message_t mesg)static int bfin_can_resume (struct platform_device *pdev) { -struct net_device *dev =dev_get_drvdata (&pdev->dev); +struct net_device *dev =platform_get_drvdata (pdev);struct bfin_can_priv *priv =netdev_priv (dev);struct bfin_can_regs __iomem *reg = priv->membase;
drivers/net/can/cc770/cc770_isa.c +2 -3
@@ -265,7 +265,7 @@ static int cc770_isa_probe(struct platform_device *pdev)else priv->clkout =COR_DEFAULT ; -dev_set_drvdata (&pdev->dev, dev); +platform_set_drvdata (pdev, dev);SET_NETDEV_DEV (dev, &pdev->dev); err =register_cc770dev (dev);
@@ -293,12 +293,11 @@ static int cc770_isa_probe(struct platform_device *pdev)static int cc770_isa_remove (struct platform_device *pdev) { -struct net_device *dev =dev_get_drvdata (&pdev->dev); +struct net_device *dev =platform_get_drvdata (pdev);struct cc770_priv *priv =netdev_priv (dev);int idx = pdev->id;unregister_cc770dev (dev); -dev_set_drvdata (&pdev->dev,NULL );if (mem[idx]) {iounmap (priv->reg_base);
drivers/net/can/cc770/cc770_platform.c +2 -2
@@ -216,7 +216,7 @@ static int cc770_platform_probe(struct platform_device *pdev) priv->reg_base, dev->irq, priv->can.clock.freq, priv->cpu_interface, priv->bus_config, priv->clkout); -dev_set_drvdata (&pdev->dev, dev); +platform_set_drvdata (pdev, dev);SET_NETDEV_DEV (dev, &pdev->dev); err =register_cc770dev (dev);
@@ -240,7 +240,7 @@ exit_release_mem:static int cc770_platform_remove (struct platform_device *pdev) { -struct net_device *dev =dev_get_drvdata (&pdev->dev); +struct net_device *dev =platform_get_drvdata (pdev);struct cc770_priv *priv =netdev_priv (dev);struct resource *mem;
drivers/net/can/grcan.c +2 -3
@@ -1646,7 +1646,7 @@ static int grcan_setup_netdev(struct platform_device *ofdev,if (err) goto exit_free_candev; -dev_set_drvdata (&ofdev->dev, dev); +platform_set_drvdata (ofdev, dev);/* Reset device to allow bit-timing to be set. No need to call * grcan_reset at this stage. That is done in grcan_open.
@@ -1715,13 +1715,12 @@ exit_error:static int grcan_remove (struct platform_device *ofdev) { -struct net_device *dev =dev_get_drvdata (&ofdev->dev); +struct net_device *dev =platform_get_drvdata (ofdev);struct grcan_priv *priv =netdev_priv (dev);unregister_candev (dev);/* Will in turn call grcan_close */ irq_dispose_mapping (dev->irq); -dev_set_drvdata (&ofdev->dev,NULL );netif_napi_del (&priv->napi);free_candev (dev);
drivers/net/can/mscan/mpc5xxx_can.c +4 -6
@@ -302,7 +302,7 @@ static int mpc5xxx_can_probe(struct platform_device *ofdev) goto exit_free_mscan; } -dev_set_drvdata (&ofdev->dev, dev); +platform_set_drvdata (ofdev, dev);dev_info (&ofdev->dev,"MSCAN at 0x%p, irq %d, clock %d Hz\n" , priv->reg_base, dev->irq, priv->can.clock.freq);
@@ -321,11 +321,9 @@ exit_unmap_mem:static int mpc5xxx_can_remove (struct platform_device *ofdev) { -struct net_device *dev =dev_get_drvdata (&ofdev->dev); +struct net_device *dev =platform_get_drvdata (ofdev);struct mscan_priv *priv =netdev_priv (dev); -dev_set_drvdata (&ofdev->dev,NULL ); -unregister_mscandev (dev);iounmap (priv->reg_base);irq_dispose_mapping (dev->irq);
@@ -338,7 +336,7 @@ static int mpc5xxx_can_remove(struct platform_device *ofdev)static struct mscan_regs saved_regs;static int mpc5xxx_can_suspend (struct platform_device *ofdev,pm_message_t state) { -struct net_device *dev =dev_get_drvdata (&ofdev->dev); +struct net_device *dev =platform_get_drvdata (ofdev);struct mscan_priv *priv =netdev_priv (dev);struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
@@ -349,7 +347,7 @@ static int mpc5xxx_can_suspend(struct platform_device *ofdev, pm_message_t statestatic int mpc5xxx_can_resume (struct platform_device *ofdev) { -struct net_device *dev =dev_get_drvdata (&ofdev->dev); +struct net_device *dev =platform_get_drvdata (ofdev);struct mscan_priv *priv =netdev_priv (dev);struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
drivers/net/can/sja1000/sja1000_isa.c +2 -3
@@ -197,7 +197,7 @@ static int sja1000_isa_probe(struct platform_device *pdev)else priv->cdr =CDR_DEFAULT ; -dev_set_drvdata (&pdev->dev, dev); +platform_set_drvdata (pdev, dev);SET_NETDEV_DEV (dev, &pdev->dev); err =register_sja1000dev (dev);
@@ -225,12 +225,11 @@ static int sja1000_isa_probe(struct platform_device *pdev)static int sja1000_isa_remove (struct platform_device *pdev) { -struct net_device *dev =dev_get_drvdata (&pdev->dev); +struct net_device *dev =platform_get_drvdata (pdev);struct sja1000_priv *priv =netdev_priv (dev);int idx = pdev->id;unregister_sja1000dev (dev); -dev_set_drvdata (&pdev->dev,NULL );if (mem[idx]) {iounmap (priv->reg_base);
drivers/net/can/sja1000/sja1000_of_platform.c +2 -4
@@ -72,13 +72,11 @@ static void sja1000_ofp_write_reg(const struct sja1000_priv *priv,static int sja1000_ofp_remove (struct platform_device *ofdev) { -struct net_device *dev =dev_get_drvdata (&ofdev->dev); +struct net_device *dev =platform_get_drvdata (ofdev);struct sja1000_priv *priv =netdev_priv (dev);struct device_node *np = ofdev->dev.of_node;struct resource res; -dev_set_drvdata (&ofdev->dev,NULL ); -unregister_sja1000dev (dev);free_sja1000dev (dev);iounmap (priv->reg_base);
@@ -181,7 +179,7 @@ static int sja1000_ofp_probe(struct platform_device *ofdev) priv->reg_base, dev->irq, priv->can.clock.freq, priv->ocr, priv->cdr); -dev_set_drvdata (&ofdev->dev, dev); +platform_set_drvdata (ofdev, dev);SET_NETDEV_DEV (dev, &ofdev->dev); err =register_sja1000dev (dev);
drivers/net/can/sja1000/sja1000_platform.c +2 -3
@@ -135,7 +135,7 @@ static int sp_probe(struct platform_device *pdev)break ; } -dev_set_drvdata (&pdev->dev, dev); +platform_set_drvdata (pdev, dev);SET_NETDEV_DEV (dev, &pdev->dev); err =register_sja1000dev (dev);
@@ -161,12 +161,11 @@ static int sp_probe(struct platform_device *pdev)static int sp_remove (struct platform_device *pdev) { -struct net_device *dev =dev_get_drvdata (&pdev->dev); +struct net_device *dev =platform_get_drvdata (pdev);struct sja1000_priv *priv =netdev_priv (dev);struct resource *res;unregister_sja1000dev (dev); -dev_set_drvdata (&pdev->dev,NULL );if (priv->reg_base)iounmap (priv->reg_base);
Signature · 1 line
1.7.10.4
Quoted 8 lines · Jingoo Han
Use the wrapper functions for getting and setting the driver data using
platform_deviceinstead of using dev_{get,set}_drvdata() with&pdev->dev, so we can directly pass a structplatform_device.Also, unnecessary
dev_set_drvdata()is removed, because the driver core clears the driver data to NULL afterdevice_releaseor on probe failure.Signed-off-by Jingoo Han <[email protected]>
Applied to linux-can-next.
Tnx,
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |