i2c: mux: Remove unneeded platform_set_drvdata to NULL in remove
Subsystems (23)
PATCH 1/1 i2c: mux: Remove unneeded platform_set_drvdata to NULL in remove
Stephen Warren pointed out as part of a code review of another mux driver that there should be no need to have "platform_set_drvdata(pdev, NULL)" in the remove function. Get rid of it in the i2c-mux-gpio driver.
See Stephen's comment at:
http://www.gossamer-threads.com/lists/linux/kernel/1678627?do=post_view_threaded#1678627
--- drivers/i2c/muxes/i2c-mux-gpio.c | 1 - 1 file changed, 1 deletion(-)
drivers/i2c/muxes/i2c-mux-gpio.c +0 -1
@@ -250,7 +250,6 @@ static int i2c_mux_gpio_remove(struct platform_device *pdev)for (i =0 ; i < mux->data.n_gpios; i++)gpio_free (mux->gpio_base + mux->data.gpios[i]); -platform_set_drvdata (pdev,NULL );i2c_put_adapter (mux->parent);return 0 ;
Signature · 1 line
1.8.1
Quoted 9 lines · Doug Anderson
Stephen Warren pointed out as part of a code review of another mux driver that there should be no need to have "
platform_set_drvdata(pdev, NULL)" in the remove function. Get rid of it in the i2c-mux-gpio driver.See Stephen's comment at:
http://www.gossamer-threads.com/lists/linux/kernel/1678627?do=post_view_threaded#1678627Signed-off-by Doug Anderson <[email protected]>
I think we should do this at least I2C subsystem wide (51 occasions of setting some *_drvdata to NULL), even better kernel-wide. Patching individual drivers won't cut the confusion around this issue, I am afraid.
Thanks,
Wolfram
Wolfram,
Quoted 4 lines · Wolfram Sang
I think we should do this at least I2C subsystem wide (51 occasions of setting some
*_drvdatato NULL), even better kernel-wide. Patching individual drivers won't cut the confusion around this issue, I am afraid.
I did it "mux" directory wide and this was the only instance. ;) I'll re-send with I2C subsystem wide. I probably won't attempt the whole kernel wide at this point, but would be very happy if someone else wanted to! :)
Thanks for the review!
-Doug
Quoted 4 lines
I'll re-send with I2C subsystem wide. I probably won't attempt the whole kernel wide at this point, but would be very happy if someone else wanted to! :)
Thanks. Please double check that setting NULL is really unneeded for the non-platform-bus variants, too, or skip those if you are unsure. Please also update the commit message to reference a stronger indication than Stephen's "should not be necessary" ;) I do agree but for the commit history, a better reference would be nice to educate readers.
Thanks,
Wolfram
Wolfram,
Quoted 10 lines · Wolfram Sang
Quoted 4 lines
I'll re-send with I2C subsystem wide. I probably won't attempt the whole kernel wide at this point, but would be very happy if someone else wanted to! :)
Thanks. Please double check that setting NULL is really unneeded for the non-platform-bus variants, too, or skip those if you are unsure. Please also update the commit message to reference a stronger indication than Stephen's "should not be necessary" ;) I do agree but for the commit history, a better reference would be nice to educate readers.
Sounds good.
I've it looks like non-platform-bus instances in drivers/i2c break down to:
* dev_set_drvdata() directly (even though we're a platform device)
* pci_set_drvdata()
* amba_set_drvdata()
* serio_set_drvdata()
I'll go ahead and include those in my patch. I've looked through the code a bit. While I can't 100% guarantee that there's not some strange code path that I'm missing, it all looks pretty straightforward. A few points to be made:
* It would be a bit hard to believe that some higher-level code could make any particular assumptions about the value in the pointer (it might point to static data, kmalloced data, etc). ...so if the higher-level code is directly looking at this value it'd really could only be looking to validate that the driver put NULL here. I don't see that anywhere.
* I've checked all of the calls to xxx_get_drvdata() in the drivers touched. The majority are in remove, suspend, or resume, so we're good there. In other cases I just validated that they aren't checking for and relying on a NULL result of xxx_get_drvdata().
* It would be possible that some subsystem tries to be helpful and call xxx_get_drvdata() for you and then pass drvdata into a callback (so I wouldn't see xxx_get_drvdata()). I don't see that (it would be a strange design anyway IMHO). Most of the time I2C devices seem to get their private data from adap->algo_data anyway (or from the pointer passed to IRQ registration) and xxx_set_drvdata() doesn't touch those.
* The __device_release_driver() function actually calls the "dev_set_drvdata(dev, NULL)" for you anyway. ...and I that's what's running the remove code anyway. ...so we'd only need to worry about code that could show up before that...
-Doug
PATCH 1/1 i2c: Remove unneeded xxx_set_drvdata(..., NULL) calls
In reply to Doug AndersonThere is simply no reason to be manually setting the private driver data to NULL in the remove/fail to probe cases. This is just extra cruft code that can be removed.
A few notes:
* Nothing relies on drvdata being set to NULL.
* The __device_release_driver() function eventually calls dev_set_drvdata(dev, NULL) anyway, so there's no need to do it twice.
* I verified that there were no cases where xxx_get_drvdata() was being called in these drivers and checking for / relying on the NULL return value.
This could be cleaned up kernel-wide but for now just take the baby step and remove from the i2c subsystem.
--- drivers/i2c/busses/i2c-au1550.c | 1 - drivers/i2c/busses/i2c-bfin-twi.c | 2 -- drivers/i2c/busses/i2c-cpm.c | 2 -- drivers/i2c/busses/i2c-davinci.c | 2 -- drivers/i2c/busses/i2c-designware-pcidrv.c | 2 -- drivers/i2c/busses/i2c-designware-platdrv.c | 2 -- drivers/i2c/busses/i2c-eg20t.c | 2 -- drivers/i2c/busses/i2c-highlander.c | 4 ---- drivers/i2c/busses/i2c-i801.c | 1 - drivers/i2c/busses/i2c-ibm_iic.c | 3 --- drivers/i2c/busses/i2c-imx.c | 1 - drivers/i2c/busses/i2c-intel-mid.c | 2 -- drivers/i2c/busses/i2c-iop3xx.c | 2 -- drivers/i2c/busses/i2c-mpc.c | 2 -- drivers/i2c/busses/i2c-mxs.c | 2 -- drivers/i2c/busses/i2c-nomadik.c | 2 -- drivers/i2c/busses/i2c-ocores.c | 1 - drivers/i2c/busses/i2c-octeon.c | 5 +---- drivers/i2c/busses/i2c-omap.c | 3 --- drivers/i2c/busses/i2c-pca-platform.c | 1 - drivers/i2c/busses/i2c-pmcmsp.c | 2 -- drivers/i2c/busses/i2c-pnx.c | 2 -- drivers/i2c/busses/i2c-powermac.c | 1 - drivers/i2c/busses/i2c-puv3.c | 2 -- drivers/i2c/busses/i2c-pxa-pci.c | 2 -- drivers/i2c/busses/i2c-pxa.c | 2 -- drivers/i2c/busses/i2c-s6000.c | 1 - drivers/i2c/busses/i2c-sh7760.c | 1 - drivers/i2c/busses/i2c-stu300.c | 1 - drivers/i2c/busses/i2c-taos-evm.c | 2 -- drivers/i2c/busses/i2c-versatile.c | 2 -- drivers/i2c/busses/i2c-xiic.c | 2 -- drivers/i2c/busses/i2c-xlr.c | 1 - drivers/i2c/busses/scx200_acb.c | 1 - drivers/i2c/muxes/i2c-mux-gpio.c | 1 - 35 files changed, 1 insertion(+), 64 deletions(-)
drivers/i2c/busses/i2c-au1550.c +0 -1
@@ -376,7 +376,6 @@ static int i2c_au1550_remove(struct platform_device *pdev) {struct i2c_au1550_data *priv =platform_get_drvdata (pdev); -platform_set_drvdata (pdev,NULL );i2c_del_adapter (&priv->adap);i2c_au1550_disable (priv);iounmap (priv->psc_base);
drivers/i2c/busses/i2c-bfin-twi.c +0 -2
@@ -724,8 +724,6 @@ static int i2c_bfin_twi_remove(struct platform_device *pdev) {struct bfin_twi_iface *iface =platform_get_drvdata (pdev); -platform_set_drvdata (pdev,NULL ); -i2c_del_adapter (&(iface->adap));free_irq (iface->irq, iface);peripheral_free_list ((unsigned short *)pdev->dev.platform_data);
drivers/i2c/busses/i2c-cpm.c +0 -2
@@ -682,7 +682,6 @@ static int cpm_i2c_probe(struct platform_device *ofdev) out_shut:cpm_i2c_shutdown (cpm); out_free: -dev_set_drvdata (&ofdev->dev,NULL );kfree (cpm);return result;
@@ -696,7 +695,6 @@ static int cpm_i2c_remove(struct platform_device *ofdev)cpm_i2c_shutdown (cpm); -dev_set_drvdata (&ofdev->dev,NULL );kfree (cpm);return 0 ;
drivers/i2c/busses/i2c-davinci.c +0 -2
@@ -755,7 +755,6 @@ err_mem_ioremap:clk_put (dev->clk); dev->clk =NULL ; err_free_mem: -platform_set_drvdata (pdev,NULL );put_device (&pdev->dev);kfree (dev); err_release_region:
@@ -771,7 +770,6 @@ static int davinci_i2c_remove(struct platform_device *pdev)i2c_davinci_cpufreq_deregister (dev); -platform_set_drvdata (pdev,NULL );i2c_del_adapter (&dev->adapter);put_device (&pdev->dev);
drivers/i2c/busses/i2c-designware-pcidrv.c +0 -2
@@ -319,7 +319,6 @@ err_free_irq:free_irq (pdev->irq, dev); err_iounmap:iounmap (dev->base); -pci_set_drvdata (pdev,NULL );put_device (&pdev->dev);kfree (dev); err_release_region:
@@ -336,7 +335,6 @@ static void i2c_dw_pci_remove(struct pci_dev *pdev)pm_runtime_forbid (&pdev->dev);pm_runtime_get_noresume (&pdev->dev); -pci_set_drvdata (pdev,NULL );i2c_del_adapter (&dev->adapter);put_device (&pdev->dev);
drivers/i2c/busses/i2c-designware-platdrv.c +0 -2
@@ -207,7 +207,6 @@ err_unuse_clocks:clk_put (dev->clk); dev->clk =NULL ; err_free_mem: -platform_set_drvdata (pdev,NULL );put_device (&pdev->dev);kfree (dev); err_release_region:
@@ -221,7 +220,6 @@ static int dw_i2c_remove(struct platform_device *pdev)struct dw_i2c_dev *dev =platform_get_drvdata (pdev);struct resource *mem; -platform_set_drvdata (pdev,NULL );pm_runtime_get_sync (&pdev->dev);i2c_del_adapter (&dev->adapter);
drivers/i2c/busses/i2c-eg20t.c +0 -2
@@ -869,8 +869,6 @@ static void pch_i2c_remove(struct pci_dev *pdev)for (i =0 ; i < adap_info->ch_num; i++) adap_info->pch_data[i].pch_base_address =NULL ; -pci_set_drvdata (pdev,NULL ); -pci_release_regions (pdev);pci_disable_device (pdev);
drivers/i2c/busses/i2c-highlander.c +0 -4
@@ -436,8 +436,6 @@ err_unmap: err:kfree (dev); -platform_set_drvdata (pdev,NULL ); -return ret; }
@@ -453,8 +451,6 @@ static int highlander_i2c_remove(struct platform_device *pdev)iounmap (dev->base);kfree (dev); -platform_set_drvdata (pdev,NULL ); -return 0 ; }
drivers/i2c/busses/i2c-i801.c +0 -1
@@ -1239,7 +1239,6 @@ static void i801_remove(struct pci_dev *dev)free_irq (dev->irq, priv);pci_release_region (dev,SMBBAR ); -pci_set_drvdata (dev,NULL );kfree (priv);/* * do not call pci_disable_device(dev) since it can cause hard hangs on
drivers/i2c/busses/i2c-ibm_iic.c +0 -3
@@ -773,7 +773,6 @@ error_cleanup:if (dev->vaddr)iounmap (dev->vaddr); -dev_set_drvdata (&ofdev->dev,NULL );kfree (dev);return ret; }
@@ -785,8 +784,6 @@ static int iic_remove(struct platform_device *ofdev) {struct ibm_iic_private *dev =dev_get_drvdata (&ofdev->dev); -dev_set_drvdata (&ofdev->dev,NULL ); -i2c_del_adapter (&dev->adap);if (dev->irq) {
drivers/i2c/busses/i2c-imx.c +0 -1
@@ -605,7 +605,6 @@ static int __exit i2c_imx_remove(struct platform_device *pdev)/* remove adapter */ dev_dbg (&i2c_imx->adapter.dev,"adapter removed\n" );i2c_del_adapter (&i2c_imx->adapter); -platform_set_drvdata (pdev,NULL );/* setup chip registers to defaults */ writeb (0 , i2c_imx->base +IMX_I2C_IADR );
drivers/i2c/busses/i2c-intel-mid.c +0 -2
@@ -1069,7 +1069,6 @@ static int intel_mid_i2c_probe(struct pci_dev *dev, fail3:free_irq (dev->irq, mrst); fail2: -pci_set_drvdata (dev,NULL );kfree (mrst); fail1:iounmap (base);
@@ -1087,7 +1086,6 @@ static void intel_mid_i2c_remove(struct pci_dev *dev)dev_err (&dev->dev,"Failed to delete i2c adapter" );free_irq (dev->irq, mrst); -pci_set_drvdata (dev,NULL );iounmap (mrst->base);kfree (mrst);pci_release_region (dev,0 );
drivers/i2c/busses/i2c-iop3xx.c +0 -2
@@ -415,8 +415,6 @@ iop3xx_i2c_remove(struct platform_device *pdev)kfree (adapter_data);kfree (padapter); -platform_set_drvdata (pdev,NULL ); -return 0 ; }
drivers/i2c/busses/i2c-mpc.c +0 -2
@@ -696,7 +696,6 @@ static int fsl_i2c_probe(struct platform_device *op)return result; fail_add: -dev_set_drvdata (&op->dev,NULL );free_irq (i2c->irq, i2c); fail_request:irq_dispose_mapping (i2c->irq);
@@ -711,7 +710,6 @@ static int fsl_i2c_remove(struct platform_device *op)struct mpc_i2c *i2c =dev_get_drvdata (&op->dev);i2c_del_adapter (&i2c->adap); -dev_set_drvdata (&op->dev,NULL );if (i2c->irq)free_irq (i2c->irq, i2c);
drivers/i2c/busses/i2c-mxs.c +0 -2
@@ -697,8 +697,6 @@ static int mxs_i2c_remove(struct platform_device *pdev)writel (MXS_I2C_CTRL0_SFTRST , i2c->regs +MXS_I2C_CTRL0_SET ); -platform_set_drvdata (pdev,NULL ); -return 0 ; }
drivers/i2c/busses/i2c-nomadik.c +0 -2
@@ -1105,7 +1105,6 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) err_irq:iounmap (dev->virtbase); err_no_ioremap: -amba_set_drvdata (adev,NULL );kfree (dev); err_pinctrl: err_no_mem:
@@ -1130,7 +1129,6 @@ static int nmk_i2c_remove(struct amba_device *adev)release_mem_region (res->start,resource_size (res));clk_put (dev->clk);pm_runtime_disable (&adev->dev); -amba_set_drvdata (adev,NULL );kfree (dev);return 0 ;
drivers/i2c/busses/i2c-ocores.c +0 -1
@@ -452,7 +452,6 @@ static int ocores_i2c_remove(struct platform_device *pdev)/* remove adapter & data */ i2c_del_adapter (&i2c->adap); -platform_set_drvdata (pdev,NULL );return 0 ; }
drivers/i2c/busses/i2c-octeon.c +1 -4
@@ -595,7 +595,7 @@ static int octeon_i2c_probe(struct platform_device *pdev) result =i2c_add_adapter (&i2c->adap);if (result <0 ) {dev_err (i2c->dev,"failed to add adapter\n" ); - goto fail_add; + goto out; }dev_info (i2c->dev,"version %s\n" ,DRV_VERSION );
@@ -603,8 +603,6 @@ static int octeon_i2c_probe(struct platform_device *pdev)return 0 ; -fail_add: -platform_set_drvdata (pdev,NULL ); out:return result; };
@@ -614,7 +612,6 @@ static int octeon_i2c_remove(struct platform_device *pdev)struct octeon_i2c *i2c =platform_get_drvdata (pdev);i2c_del_adapter (&i2c->adap); -platform_set_drvdata (pdev,NULL );return 0 ; };
drivers/i2c/busses/i2c-omap.c +0 -3
@@ -1260,7 +1260,6 @@ err_unuse_clocks:pm_runtime_put (dev->dev);pm_runtime_disable (&pdev->dev); err_free_mem: -platform_set_drvdata (pdev,NULL );return r; }
@@ -1270,8 +1269,6 @@ static int omap_i2c_remove(struct platform_device *pdev)struct omap_i2c_dev *dev =platform_get_drvdata (pdev);int ret; -platform_set_drvdata (pdev,NULL ); -i2c_del_adapter (&dev->adapter); ret =pm_runtime_get_sync (&pdev->dev);if (IS_ERR_VALUE (ret))
drivers/i2c/busses/i2c-pca-platform.c +0 -1
@@ -260,7 +260,6 @@ e_print:static int i2c_pca_pf_remove (struct platform_device *pdev) {struct i2c_pca_pf_data *i2c =platform_get_drvdata (pdev); -platform_set_drvdata (pdev,NULL );i2c_del_adapter (&i2c->adap);
drivers/i2c/busses/i2c-pmcmsp.c +0 -2
@@ -349,7 +349,6 @@ static int pmcmsptwi_probe(struct platform_device *pldev)return 0 ; ret_unmap: -platform_set_drvdata (pldev,NULL );if (pmcmsptwi_data.irq) {pmcmsptwi_writel (0 , pmcmsptwi_data.iobase +MSP_TWI_INT_MSK_REG_OFFSET );
@@ -374,7 +373,6 @@ static int pmcmsptwi_remove(struct platform_device *pldev)i2c_del_adapter (&pmcmsptwi_adapter); -platform_set_drvdata (pldev,NULL );if (pmcmsptwi_data.irq) {pmcmsptwi_writel (0 , pmcmsptwi_data.iobase +MSP_TWI_INT_MSK_REG_OFFSET );
drivers/i2c/busses/i2c-pnx.c +0 -2
@@ -761,7 +761,6 @@ out_clkget: out_drvdata:kfree (alg_data); err_kzalloc: -platform_set_drvdata (pdev,NULL );return ret; }
@@ -776,7 +775,6 @@ static int i2c_pnx_remove(struct platform_device *pdev)release_mem_region (alg_data->base,I2C_PNX_REGION_SIZE );clk_put (alg_data->clk);kfree (alg_data); -platform_set_drvdata (pdev,NULL );return 0 ; }
drivers/i2c/busses/i2c-powermac.c +0 -1
@@ -221,7 +221,6 @@ static int i2c_powermac_remove(struct platform_device *dev)printk (KERN_WARNING "i2c-powermac.c: Failed to remove bus %s !\n" , adapter->name); -platform_set_drvdata (dev,NULL );memset (adapter,0 ,sizeof (*adapter));return 0 ;
drivers/i2c/busses/i2c-puv3.c +0 -2
@@ -223,7 +223,6 @@ static int puv3_i2c_probe(struct platform_device *pdev)return 0 ; fail_add_adapter: -platform_set_drvdata (pdev,NULL );kfree (adapter); fail_nomem:release_mem_region (mem->start,resource_size (mem));
@@ -245,7 +244,6 @@ static int puv3_i2c_remove(struct platform_device *pdev) }put_device (&pdev->dev); -platform_set_drvdata (pdev,NULL ); mem =platform_get_resource (pdev,IORESOURCE_MEM ,0 );release_mem_region (mem->start,resource_size (mem));
drivers/i2c/busses/i2c-pxa-pci.c +0 -2
@@ -128,7 +128,6 @@ static int ce4100_i2c_probe(struct pci_dev *dev,return 0 ; err_dev_add: -pci_set_drvdata (dev,NULL );kfree (sds); err_mem:pci_disable_device (dev);
@@ -141,7 +140,6 @@ static void ce4100_i2c_remove(struct pci_dev *dev)unsigned int i; sds =pci_get_drvdata (dev); -pci_set_drvdata (dev,NULL );for (i =0 ; i <ARRAY_SIZE (sds->pdev); i++)platform_device_unregister (sds->pdev[i]);
drivers/i2c/busses/i2c-pxa.c +0 -2
@@ -1219,8 +1219,6 @@ static int __exit i2c_pxa_remove(struct platform_device *dev) {struct pxa_i2c *i2c =platform_get_drvdata (dev); -platform_set_drvdata (dev,NULL ); -i2c_del_adapter (&i2c->adap);if (!i2c->use_pio)free_irq (i2c->irq, i2c);
drivers/i2c/busses/i2c-s6000.c +0 -1
@@ -365,7 +365,6 @@ static int s6i2c_remove(struct platform_device *pdev) {struct s6i2c_if *iface =platform_get_drvdata (pdev);i2c_wr16 (iface,S6_I2C_ENABLE ,0 ); -platform_set_drvdata (pdev,NULL );i2c_del_adapter (&iface->adap);free_irq (iface->irq, iface);clk_disable (iface->clk);
drivers/i2c/busses/i2c-sh7760.c +0 -1
@@ -546,7 +546,6 @@ static int sh7760_i2c_remove(struct platform_device *pdev)release_resource (id->ioarea);kfree (id->ioarea);kfree (id); -platform_set_drvdata (pdev,NULL );return 0 ; }
drivers/i2c/busses/i2c-stu300.c +0 -1
@@ -975,7 +975,6 @@ stu300_remove(struct platform_device *pdev)i2c_del_adapter (&dev->adapter);/* Turn off everything */ stu300_wr8 (0x00 , dev->virtbase +I2C_CR ); -platform_set_drvdata (pdev,NULL );return 0 ; }
drivers/i2c/busses/i2c-taos-evm.c +0 -2
@@ -271,7 +271,6 @@ static int taos_connect(struct serio *serio, struct serio_driver *drv) exit_close:serio_close (serio); exit_kfree: -serio_set_drvdata (serio,NULL );kfree (taos); exit:return err;
@@ -285,7 +284,6 @@ static void taos_disconnect(struct serio *serio)i2c_unregister_device (taos->client);i2c_del_adapter (&taos->adapter);serio_close (serio); -serio_set_drvdata (serio,NULL );kfree (taos);dev_info (&serio->dev,"Disconnected from TAOS EVM\n" );
drivers/i2c/busses/i2c-versatile.c +0 -2
@@ -125,8 +125,6 @@ static int i2c_versatile_remove(struct platform_device *dev) {struct i2c_versatile *i2c =platform_get_drvdata (dev); -platform_set_drvdata (dev,NULL ); -i2c_del_adapter (&i2c->adap);return 0 ; }
drivers/i2c/busses/i2c-xiic.c +0 -2
@@ -784,8 +784,6 @@ static int xiic_i2c_remove(struct platform_device *pdev)xiic_deinit (i2c); -platform_set_drvdata (pdev,NULL ); -free_irq (platform_get_irq (pdev,0 ), i2c);iounmap (i2c->base);
drivers/i2c/busses/i2c-xlr.c +0 -1
@@ -256,7 +256,6 @@ static int xlr_i2c_remove(struct platform_device *pdev) priv =platform_get_drvdata (pdev);i2c_del_adapter (&priv->adap); -platform_set_drvdata (pdev,NULL );return 0 ; }
drivers/i2c/busses/scx200_acb.c +0 -1
@@ -542,7 +542,6 @@ static int scx200_remove(struct platform_device *pdev)struct scx200_acb_iface *iface; iface =platform_get_drvdata (pdev); -platform_set_drvdata (pdev,NULL );scx200_cleanup_iface (iface);return 0 ;
drivers/i2c/muxes/i2c-mux-gpio.c +0 -1
@@ -250,7 +250,6 @@ static int i2c_mux_gpio_remove(struct platform_device *pdev)for (i =0 ; i < mux->data.n_gpios; i++)gpio_free (mux->gpio_base + mux->data.gpios[i]); -platform_set_drvdata (pdev,NULL );i2c_put_adapter (mux->parent);return 0 ;
Signature · 1 line
1.8.1.3
PATCH 1/1 i2c: Remove unneeded xxx_set_drvdata(..., NULL) calls
Quoted 9 lines · Doug Anderson
There is simply no reason to be manually setting the private driver data to NULL in the remove/fail to probe cases. This is just extra cruft code that can be removed.
A few notes:
* Nothing relies on drvdata being set to NULL.
* The__device_release_driver()function eventually callsdev_set_drvdata(dev, NULL)anyway, so there's no need to do it twice.
I had not noticed this change. Very good news!
Quoted 4 lines
* I verified that there were no cases where
xxx_get_drvdata()was being called in these drivers and checking for / relying on the NULL return value.
Quoted 8 lines
This could be cleaned up kernel-wide but for now just take the baby step and remove from the i2c subsystem.
Reported-by Wolfram Sang <[email protected]>Reported-by Stephen Warren <[email protected]>Signed-off-by Doug Anderson <[email protected]>---
(...)
For i2c-taos-evm:
Also a note:
Quoted 12 lines
drivers/i2c/busses/i2c-octeon.c +1
-1@@ -595,7 +595,7 @@ static int octeon_i2c_probe(struct platform_device *pdev) result =i2c_add_adapter (&i2c->adap);if (result <0 ) {dev_err (i2c->dev,"failed to add adapter\n" ); - goto fail_add; + goto out; }dev_info (i2c->dev,"version %s\n" ,DRV_VERSION );
drivers/i2c/busses/i2c-octeon.c static int octeon_i2c_probe(struct platform_device *pdev) · line 608
Quoted 8 lines
drivers/i2c/busses/i2c-octeon.c +0
-2@@ -603,8 +603,6 @@ static int octeon_i2c_probe(struct platform_device *pdev)return 0 ; -fail_add: -platform_set_drvdata (pdev,NULL ); out:return result; };
There no longer is any point in this error path, all gotos in this function could be changed to returns (in a separate patch, obviously.)
Signature · 1 line
Jean Delvare
PATCH 1/1 i2c: Remove unneeded xxx_set_drvdata(..., NULL) calls
In reply to Doug AndersonQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Doug" == Doug Anderson <[email protected]> writes:
Doug> There is simply no reason to be manually setting the private driver Doug> data to NULL in the remove/fail to probe cases. This is just extra Doug> cruft code that can be removed.
Doug> A few notes:
Doug> * Nothing relies on drvdata being set to NULL.
Doug> * The __device_release_driver() function eventually calls
Doug> dev_set_drvdata(dev, NULL) anyway, so there's no need to do it
Doug> twice.
Doug> * I verified that there were no cases where xxx_get_drvdata() was
Doug> being called in these drivers and checking for / relying on the NULL
Doug> return value.
Doug> This could be cleaned up kernel-wide but for now just take the baby Doug> step and remove from the i2c subsystem.
Doug> Reported-by: Wolfram Sang <[email protected]> Doug> Reported-by: Stephen Warren <[email protected]> Doug> Signed-off-by: Doug Anderson <[email protected]>
For i2c-ocores.c + i2c-mux-gpio.c:
Signature · 1 line
Bye, Peter Korsgaard
Re: [PATCH] i2c: Remove unneeded xxx_set_drvdata(..., NULL) calls
In reply to Doug AndersonQuoted 19 lines · Doug Anderson
There is simply no reason to be manually setting the private driver data to NULL in the remove/fail to probe cases. This is just extra cruft code that can be removed.
A few notes:
* Nothing relies on drvdata being set to NULL.
* The__device_release_driver()function eventually callsdev_set_drvdata(dev, NULL)anyway, so there's no need to do it twice.
* I verified that there were no cases wherexxx_get_drvdata()was being called in these drivers and checking for / relying on the NULL return value.This could be cleaned up kernel-wide but for now just take the baby step and remove from the i2c subsystem.
Reported-by Wolfram Sang <[email protected]>Reported-by Stephen Warren <[email protected]>Signed-off-by Doug Anderson <[email protected]>
Quoted 7 lines
--- drivers/i2c/busses/i2c-au1550.c | 1 - drivers/i2c/busses/i2c-bfin-twi.c | 2 -- drivers/i2c/busses/i2c-cpm.c | 2 -- drivers/i2c/busses/i2c-davinci.c | 2 -- drivers/i2c/busses/i2c-designware-pcidrv.c | 2 -- drivers/i2c/busses/i2c-designware-platdrv.c | 2 --
For i2c-designware-pcidrv.c and i2c-designware-platdrv.c:
PATCH 1/1 i2c: Remove unneeded xxx_set_drvdata(..., NULL) calls
In reply to Doug AndersonDear Doug Anderson,
Quoted 13 lines
There is simply no reason to be manually setting the private driver data to NULL in the remove/fail to probe cases. This is just extra cruft code that can be removed.
A few notes:
* Nothing relies on drvdata being set to NULL.
* The__device_release_driver()function eventually callsdev_set_drvdata(dev, NULL)anyway, so there's no need to do it twice.
* I verified that there were no cases wherexxx_get_drvdata()was being called in these drivers and checking for / relying on the NULL return value.
Quoted 6 lines
This could be cleaned up kernel-wide but for now just take the baby step and remove from the i2c subsystem.
Reported-by Wolfram Sang <[email protected]>Reported-by Stephen Warren <[email protected]>Signed-off-by Doug Anderson <[email protected]>
For
Quoted 1 line
drivers/i2c/busses/i2c-mxs.c | 2 --
[...]
drivers/i2c/busses/i2c-mxs.c static int mxs_i2c_remove(struct platform_device *pdev) · line 701
Quoted 12 lines
drivers/i2c/busses/i2c-mxs.c +0
-2@@ -697,8 +697,6 @@ static int mxs_i2c_remove(struct platform_device *pdev)writel (MXS_I2C_CTRL0_SFTRST , i2c->regs +MXS_I2C_CTRL0_SET ); -platform_set_drvdata (pdev,NULL ); -return 0 ; }
[...]
Add my:
Wolfram Sang
AppliedPATCH 1/1 i2c: Remove unneeded xxx_set_drvdata(..., NULL) calls
In reply to Doug AndersonQuoted 13 lines · Doug Anderson
There is simply no reason to be manually setting the private driver data to NULL in the remove/fail to probe cases. This is just extra cruft code that can be removed.
A few notes:
* Nothing relies on drvdata being set to NULL.
* The__device_release_driver()function eventually callsdev_set_drvdata(dev, NULL)anyway, so there's no need to do it twice.
* I verified that there were no cases wherexxx_get_drvdata()was being called in these drivers and checking for / relying on the NULL return value.
Quoted 6 lines
This could be cleaned up kernel-wide but for now just take the baby step and remove from the i2c subsystem.
Reported-by Wolfram Sang <[email protected]>Reported-by Stephen Warren <[email protected]>Signed-off-by Doug Anderson <[email protected]>
Applied, thanks!