media: pci: bt8xx: convert to i2c_new_scanned_device

Move from the deprecated i2c_new_probed_device() to the new
i2c_new_scanned_device(). Make use of the new ERRPTR if suitable.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Sean Young <sean@mess.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/pci/bt8xx/bttv-input.c b/drivers/media/pci/bt8xx/bttv-input.c
index 492bc85..41226f1 100644 (file)
--- a/drivers/media/pci/bt8xx/bttv-input.c
+++ b/drivers/media/pci/bt8xx/bttv-input.c
@@ -386,7 +386,7 @@ void init_bttv_i2c_ir(struct bttv *btv)
 
        if (btv->init_data.name) {
                info.platform_data = &btv->init_data;
-               i2c_dev = i2c_new_device(&btv->c.i2c_adap, &info);
+               i2c_dev = i2c_new_client_device(&btv->c.i2c_adap, &info);
        } else {
                /*
                 * The external IR receiver is at i2c address 0x34 (0x35 for
@@ -396,9 +396,9 @@ void init_bttv_i2c_ir(struct bttv *btv)
                 * internal.
                 * That's why we probe 0x1a (~0x34) first. CB
                 */
-               i2c_dev = i2c_new_probed_device(&btv->c.i2c_adap, &info, addr_list, NULL);
+               i2c_dev = i2c_new_scanned_device(&btv->c.i2c_adap, &info, addr_list, NULL);
        }
-       if (NULL == i2c_dev)
+       if (IS_ERR(i2c_dev))
                return;
 
 #if defined(CONFIG_MODULES) && defined(MODULE)