ALSA: aoa: Remove obsolete cleanup for clientdata
authorAxel Lin <axel.lin@gmail.com>
Fri, 9 Sep 2011 11:04:45 +0000 (19:04 +0800)
committerTakashi Iwai <tiwai@suse.de>
Mon, 12 Sep 2011 08:35:47 +0000 (10:35 +0200)
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 <axel.lin@gmail.com>
Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/aoa/codecs/onyx.c

index 3687a6cc9881edf17a0e4e9ba8966d840c6cff79..762af68c8996fbb83a822638f76f2c29a7d63f9a 100644 (file)
@@ -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;
 }