From 55827f4aa6442ddd1d6a4e1e32f2f457eb113c22 Mon Sep 17 00:00:00 2001 From: Doug Anderson Date: Fri, 15 Feb 2013 13:18:35 +0000 Subject: i2c: Remove unneeded xxx_set_drvdata(..., NULL) calls 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 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. Reported-by: Wolfram Sang Reported-by: Stephen Warren Signed-off-by: Doug Anderson Reviewed-by: Jean Delvare Acked-by: Peter Korsgaard Reviewed-by: Mika Westerberg Reviewed-by: Marek Vasut Signed-off-by: Wolfram Sang --- drivers/i2c/busses/i2c-ibm_iic.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'drivers/i2c/busses/i2c-ibm_iic.c') diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c index 33a2abb6c06..405a2e24045 100644 --- a/drivers/i2c/busses/i2c-ibm_iic.c +++ b/drivers/i2c/busses/i2c-ibm_iic.c @@ -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) { -- cgit v1.2.3-70-g09d2