From 5758960353d179f0541226764a1e47eff01666ff Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Fri, 9 Sep 2011 19:04:45 +0800 Subject: ALSA: aoa: Remove obsolete cleanup for clientdata The i2c core will clear the clientdata pointer automatically. We don't have to set the `data' field to NULL in remove() or if probe() failed anymore. Also remove a unneeded NULL checking for kfree. Signed-off-by: Axel Lin Reviewed-by: Wolfram Sang Signed-off-by: Takashi Iwai --- sound/aoa/codecs/onyx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'sound/aoa/codecs/onyx.c') diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c index 3687a6cc988..762af68c899 100644 --- a/sound/aoa/codecs/onyx.c +++ b/sound/aoa/codecs/onyx.c @@ -1067,7 +1067,6 @@ static int onyx_i2c_probe(struct i2c_client *client, printk(KERN_DEBUG PFX "created and attached onyx instance\n"); return 0; fail: - i2c_set_clientdata(client, NULL); kfree(onyx); return -ENODEV; } @@ -1112,8 +1111,7 @@ static int onyx_i2c_remove(struct i2c_client *client) aoa_codec_unregister(&onyx->codec); of_node_put(onyx->codec.node); - if (onyx->codec_info) - kfree(onyx->codec_info); + kfree(onyx->codec_info); kfree(onyx); return 0; } -- cgit v1.2.3