korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 16:24:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

media: pci: bt8xx: convert to i2c_new_scanned_device

Browse Source 
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>
This commit is contained in:
Wolfram Sang 2019-12-16 13:29:43 +01:00 committed by Mauro Carvalho Chehab
parent 021472666c
commit 832d76ec68
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/pci/bt8xx/bttv-input.c
View File

@ -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)
* 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)