summaryrefslogtreecommitdiff
path: root/drivers/staging/olpc_dcon
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2011-08-25 12:53:30 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-25 08:30:23 -0700
commit42b565df8567751dfdca85b57de6219ddfee49f8 (patch)
treeaea47afe8d990ac71ed8e046724e4955f9179285 /drivers/staging/olpc_dcon
parent1c2de3e742494813acfb93140cf42ca22f4d62ce (diff)
staging/olpc_dcon: Remove obsolete cleanup for clientdata
A few new i2c-drivers came into the kernel which clear the clientdata-pointer on exit or error. This is obsolete meanwhile, the core will do it. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Acked-by: Andres Salomon <dilinger@queued.net> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Marek Belisko <marek.belisko@open-nandra.com> Acked-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/olpc_dcon')
-rw-r--r--drivers/staging/olpc_dcon/olpc_dcon.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c
index 87268059eb45..d3cd68e9045e 100644
--- a/drivers/staging/olpc_dcon/olpc_dcon.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon.c
@@ -697,7 +697,6 @@ static int dcon_probe(struct i2c_client *client, const struct i2c_device_id *id)
eirq:
free_irq(DCON_IRQ, dcon);
einit:
- i2c_set_clientdata(client, NULL);
kfree(dcon);
return rc;
}
@@ -706,8 +705,6 @@ static int dcon_remove(struct i2c_client *client)
{
struct dcon_priv *dcon = i2c_get_clientdata(client);
- i2c_set_clientdata(client, NULL);
-
fb_unregister_client(&dcon->fbevent_nb);
unregister_reboot_notifier(&dcon->reboot_nb);
atomic_notifier_chain_unregister(&panic_notifier_list, &dcon_panic_nb);