OSDN Git Service

media: i2c: adv7511-v4l2: drop check because i2c_unregister_device() is NULL safe
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Tue, 20 Aug 2019 15:34:40 +0000 (12:34 -0300)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Mon, 26 Aug 2019 13:44:16 +0000 (10:44 -0300)
No need to check the argument of i2c_unregister_device() because the
function itself does it.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/i2c/adv7511-v4l2.c

index 3b3966c..62763ec 100644 (file)
@@ -1940,8 +1940,7 @@ static int adv7511_probe(struct i2c_client *client, const struct i2c_device_id *
 err_unreg_pktmem:
        i2c_unregister_device(state->i2c_pktmem);
 err_unreg_cec:
-       if (state->i2c_cec)
-               i2c_unregister_device(state->i2c_cec);
+       i2c_unregister_device(state->i2c_cec);
 err_unreg_edid:
        i2c_unregister_device(state->i2c_edid);
 err_entity:
@@ -1967,8 +1966,7 @@ static int adv7511_remove(struct i2c_client *client)
        adv7511_init_setup(sd);
        cancel_delayed_work(&state->edid_handler);
        i2c_unregister_device(state->i2c_edid);
-       if (state->i2c_cec)
-               i2c_unregister_device(state->i2c_cec);
+       i2c_unregister_device(state->i2c_cec);
        i2c_unregister_device(state->i2c_pktmem);
        destroy_workqueue(state->work_queue);
        v4l2_device_unregister_subdev(sd);