Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28ade0f2 authored by Wolfram Sang's avatar Wolfram Sang Committed by Samuel Ortiz
Browse files

mfd: Remove unneeded and dangerous clearing of clientdata 



Unlike real i2c-devices which get detached from the driver, dummy-devices
get truly unregistered. So, there has never been a need to clear the
clientdata because the device will go away anyhow. For the occasions fixed
here, clearing clientdata was even dangerous as the structure was freed
already.

Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Acked-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 62579266

drivers/mfd/88pm860x-i2c.c

+0 −1
Original line number Diff line number Diff line
@@ -200,7 +200,6 @@ static int __devexit pm860x_remove(struct i2c_client *client) 


	pm860x_device_exit(chip);

	i2c_unregister_device(chip->companion);

	i2c_set_clientdata(chip->companion, NULL);

	i2c_set_clientdata(chip->client, NULL);

	i2c_set_clientdata(client, NULL);

	kfree(chip);

drivers/mfd/max8925-i2c.c

+0 −2
Original line number Diff line number Diff line
@@ -173,8 +173,6 @@ static int __devexit max8925_remove(struct i2c_client *client) 
	max8925_device_exit(chip);

	i2c_unregister_device(chip->adc);

	i2c_unregister_device(chip->rtc);

	i2c_set_clientdata(chip->adc, NULL);

	i2c_set_clientdata(chip->rtc, NULL);

	i2c_set_clientdata(chip->i2c, NULL);

	kfree(chip);

	return 0;