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. Simplify the
kfree() calls after that, the pointers don't need to be checked.
Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxx>
Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Cc: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Cc: Jarod Wilson <jarod@xxxxxxxxxx>
Cc: Joe Perches <joe@xxxxxxxxxxx>
---
Compile tested only.
drivers/staging/lirc/lirc_zilog.c | 28 +++++++++-------------------
1 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/drivers/staging/lirc/lirc_zilog.c b/drivers/staging/lirc/lirc_zilog.c
index 3fe5f41..df1055f 100644
--- a/drivers/staging/lirc/lirc_zilog.c
+++ b/drivers/staging/lirc/lirc_zilog.c
@@ -1214,15 +1214,12 @@ static int ir_remove(struct i2c_client *client)
/* Good-bye Rx */
destroy_rx_kthread(ir->rx);
- if (ir->rx != NULL) {
- if (ir->rx->buf.fifo_initialized)
- lirc_buffer_free(&ir->rx->buf);
- i2c_set_clientdata(ir->rx->c, NULL);
- kfree(ir->rx);
- }
+ if (ir->rx && ir->rx->buf.fifo_initialized)
+ lirc_buffer_free(&ir->rx->buf);
+
+ kfree(ir->rx);
/* Good-bye Tx */
- i2c_set_clientdata(ir->tx->c, NULL);
kfree(ir->tx);
/* Good-bye IR */
@@ -1388,18 +1385,11 @@ out_unregister:
out_free_thread:
destroy_rx_kthread(ir->rx);
out_free_xx:
- if (ir->rx != NULL) {
- if (ir->rx->buf.fifo_initialized)
- lirc_buffer_free(&ir->rx->buf);
- if (ir->rx->c != NULL)
- i2c_set_clientdata(ir->rx->c, NULL);
- kfree(ir->rx);
- }
- if (ir->tx != NULL) {
- if (ir->tx->c != NULL)
- i2c_set_clientdata(ir->tx->c, NULL);
- kfree(ir->tx);
- }
+ if (ir->rx && ir->rx->buf.fifo_initialized)
+ lirc_buffer_free(&ir->rx->buf);
+
+ kfree(ir->rx);
+ kfree(ir->tx);
out_free_ir:
del_ir_device(ir);
kfree(ir);
--
1.7.2.3
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
