Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a94241a authored by Jean Delvare's avatar Jean Delvare
Browse files

i2c: Add support for custom probe function 



The probe method used by i2c_new_probed_device() may not be suitable
for all cases. Let the caller provide its own, optional probe
function.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Acked-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent f1c2e33c

Documentation/i2c/instantiating-devices

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static int __devinit usb_hcd_pnx4008_probe(struct platform_device *pdev) 
	memset(&i2c_info, 0, sizeof(struct i2c_board_info));

	strlcpy(i2c_info.name, "isp1301_pnx", I2C_NAME_SIZE);

	isp1301_i2c_client = i2c_new_probed_device(i2c_adap, &i2c_info,

						   normal_i2c);

						   normal_i2c, NULL);

	i2c_put_adapter(i2c_adap);

	(...)

}

drivers/i2c/i2c-core.c

+10 −6
Original line number Diff line number Diff line
@@ -1464,15 +1464,19 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver) 
struct i2c_client *

i2c_new_probed_device(struct i2c_adapter *adap,

		      struct i2c_board_info *info,

		      unsigned short const *addr_list)

		      unsigned short const *addr_list,

		      int (*probe)(struct i2c_adapter *, unsigned short addr))

{

	int i;



	if (!probe) {

		/* Stop here if the bus doesn't support probing */

		if (!i2c_check_functionality(adap, I2C_FUNC_SMBUS_READ_BYTE)) {

			dev_err(&adap->dev, "Probing not supported\n");

			return NULL;

		}

		probe = i2c_default_probe;

	}



	for (i = 0; addr_list[i] != I2C_CLIENT_END; i++) {

		/* Check address validity */
@@ -1490,7 +1494,7 @@ i2c_new_probed_device(struct i2c_adapter *adap, 
		}



		/* Test address responsiveness */

		if (i2c_default_probe(adap, addr_list[i]))

		if (probe(adap, addr_list[i]))

			break;

	}

drivers/macintosh/therm_windtunnel.c

+2 −2
Original line number Diff line number Diff line
@@ -322,10 +322,10 @@ do_attach( struct i2c_adapter *adapter ) 


		memset(&info, 0, sizeof(struct i2c_board_info));

		strlcpy(info.type, "therm_ds1775", I2C_NAME_SIZE);

		i2c_new_probed_device(adapter, &info, scan_ds1775);

		i2c_new_probed_device(adapter, &info, scan_ds1775, NULL);



		strlcpy(info.type, "therm_adm1030", I2C_NAME_SIZE);

		i2c_new_probed_device(adapter, &info, scan_adm1030);

		i2c_new_probed_device(adapter, &info, scan_adm1030, NULL);



		if( x.thermostat && x.fan ) {

			x.running = 1;

drivers/media/video/bt8xx/bttv-i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ void __devinit init_bttv_i2c_ir(struct bttv *btv) 


		memset(&info, 0, sizeof(struct i2c_board_info));

		strlcpy(info.type, "ir_video", I2C_NAME_SIZE);

		i2c_new_probed_device(&btv->c.i2c_adap, &info, addr_list);

		i2c_new_probed_device(&btv->c.i2c_adap, &info, addr_list, NULL);

	}

}

drivers/media/video/cx18/cx18-i2c.c

+2 −1
Original line number Diff line number Diff line
@@ -117,7 +117,8 @@ static int cx18_i2c_new_ir(struct cx18 *cx, struct i2c_adapter *adap, u32 hw, 
		break;

	}



	return i2c_new_probed_device(adap, &info, addr_list) == NULL ? -1 : 0;

	return i2c_new_probed_device(adap, &info, addr_list, NULL) == NULL ?

	       -1 : 0;

}



int cx18_i2c_register(struct cx18 *cx, unsigned idx)