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-highlander.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'drivers/i2c/busses/i2c-highlander.c') diff --git a/drivers/i2c/busses/i2c-highlander.c b/drivers/i2c/busses/i2c-highlander.c index 3351cc7ed11f..436b0f254916 100644 --- a/drivers/i2c/busses/i2c-highlander.c +++ b/drivers/i2c/busses/i2c-highlander.c @@ -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; } -- cgit v1.2.3