Commit 832d76ec authored by Wolfram Sang's avatar Wolfram Sang Committed by Mauro Carvalho Chehab

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: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 02147266
...@@ -386,7 +386,7 @@ void init_bttv_i2c_ir(struct bttv *btv) ...@@ -386,7 +386,7 @@ void init_bttv_i2c_ir(struct bttv *btv)
if (btv->init_data.name) { if (btv->init_data.name) {
info.platform_data = &btv->init_data; 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 { } else {
/* /*
* The external IR receiver is at i2c address 0x34 (0x35 for * The external IR receiver is at i2c address 0x34 (0x35 for
...@@ -396,9 +396,9 @@ void init_bttv_i2c_ir(struct bttv *btv) ...@@ -396,9 +396,9 @@ void init_bttv_i2c_ir(struct bttv *btv)
* internal. * internal.
* That's why we probe 0x1a (~0x34) first. CB * 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; return;
#if defined(CONFIG_MODULES) && defined(MODULE) #if defined(CONFIG_MODULES) && defined(MODULE)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment