media: pci: bt8xx: convert to i2c_new_scanned_device (832d76ec) · Commits · 戴 / test

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:

drivers/media/pci/bt8xx/bttv-input.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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)