Commit 81ff8554 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'i2c-for-6.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c updates from Wolfram Sang:
 "This marks the end of a transition to let I2C have the same probe
  semantics as other subsystems. Uwe took care that no drivers in the
  current tree nor in -next use the deprecated .probe call. So, it is a
  good time to switch to the new, standard semantics now.

  There is also a regression fix:

   - regression fix for the notifier handling of the I2C core

   - final coversions of drivers away from deprecated .probe

   - make .probe_new the standard probe and convert I2C core to use it

* tag 'i2c-for-6.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: dev: Fix bus callback return values
  i2c: Convert drivers to new .probe() callback
  i2c: mux: Convert all drivers to new .probe() callback
  i2c: Switch .probe() to not take an id parameter
  media: i2c: ov2685: convert to i2c's .probe_new()
  media: i2c: ov5695: convert to i2c's .probe_new()
  w1: ds2482: Convert to i2c's .probe_new()
  serial: sc16is7xx: Convert to i2c's .probe_new()
  mtd: maps: pismo: Convert to i2c's .probe_new()
  misc: ad525x_dpot-i2c: Convert to i2c's .probe_new()
parents e25c54d1 9e5f81f9

drivers/i2c/i2c-core-base.c

+3 −10
Original line number Diff line number Diff line
@@ -561,15 +561,8 @@ static int i2c_device_probe(struct device *dev) 
		goto err_detach_pm_domain;

	}



	/*

	 * When there are no more users of probe(),

	 * rename probe_new to probe.

	 */

	if (driver->probe_new)

		status = driver->probe_new(client);

	else if (driver->probe)

		status = driver->probe(client,

				       i2c_match_id(driver->id_table, client));

	if (driver->probe)

		status = driver->probe(client);

	else

		status = -EINVAL;
@@ -1057,7 +1050,7 @@ static int dummy_probe(struct i2c_client *client) 


static struct i2c_driver dummy_driver = {

	.driver.name	= "dummy",

	.probe_new	= dummy_probe,

	.probe		= dummy_probe,

	.id_table	= dummy_id,

};

drivers/i2c/i2c-dev.c

+18 −6
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ static void i2cdev_dev_release(struct device *dev) 
	kfree(i2c_dev);

}



static int i2cdev_attach_adapter(struct device *dev, void *dummy)

static int i2cdev_attach_adapter(struct device *dev)

{

	struct i2c_adapter *adap;

	struct i2c_dev *i2c_dev;
@@ -685,7 +685,7 @@ static int i2cdev_attach_adapter(struct device *dev, void *dummy) 
	return NOTIFY_DONE;

}



static int i2cdev_detach_adapter(struct device *dev, void *dummy)

static int i2cdev_detach_adapter(struct device *dev)

{

	struct i2c_adapter *adap;

	struct i2c_dev *i2c_dev;
@@ -711,9 +711,9 @@ static int i2cdev_notifier_call(struct notifier_block *nb, unsigned long action, 


	switch (action) {

	case BUS_NOTIFY_ADD_DEVICE:

		return i2cdev_attach_adapter(dev, NULL);

		return i2cdev_attach_adapter(dev);

	case BUS_NOTIFY_DEL_DEVICE:

		return i2cdev_detach_adapter(dev, NULL);

		return i2cdev_detach_adapter(dev);

	}



	return NOTIFY_DONE;
@@ -725,6 +725,18 @@ static struct notifier_block i2cdev_notifier = { 


/* ------------------------------------------------------------------------- */



static int __init i2c_dev_attach_adapter(struct device *dev, void *dummy)

{

	i2cdev_attach_adapter(dev);

	return 0;

}



static int __exit i2c_dev_detach_adapter(struct device *dev, void *dummy)

{

	i2cdev_detach_adapter(dev);

	return 0;

}



/*

 * module load/unload record keeping

 */
@@ -752,7 +764,7 @@ static int __init i2c_dev_init(void) 
		goto out_unreg_class;



	/* Bind to already existing adapters right away */

	i2c_for_each_dev(NULL, i2cdev_attach_adapter);

	i2c_for_each_dev(NULL, i2c_dev_attach_adapter);



	return 0;
@@ -768,7 +780,7 @@ static int __init i2c_dev_init(void) 
static void __exit i2c_dev_exit(void)

{

	bus_unregister_notifier(&i2c_bus_type, &i2cdev_notifier);

	i2c_for_each_dev(NULL, i2cdev_detach_adapter);

	i2c_for_each_dev(NULL, i2c_dev_detach_adapter);

	class_destroy(i2c_dev_class);

	unregister_chrdev_region(MKDEV(I2C_MAJOR, 0), I2C_MINORS);

}

drivers/i2c/i2c-slave-eeprom.c

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static struct i2c_driver i2c_slave_eeprom_driver = { 
	.driver = {

		.name = "i2c-slave-eeprom",

	},

	.probe_new = i2c_slave_eeprom_probe,

	.probe = i2c_slave_eeprom_probe,

	.remove = i2c_slave_eeprom_remove,

	.id_table = i2c_slave_eeprom_id,

};

drivers/i2c/i2c-slave-testunit.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static struct i2c_driver i2c_slave_testunit_driver = { 
	.driver = {

		.name = "i2c-slave-testunit",

	},

	.probe_new = i2c_slave_testunit_probe,

	.probe = i2c_slave_testunit_probe,

	.remove = i2c_slave_testunit_remove,

	.id_table = i2c_slave_testunit_id,

};

drivers/i2c/i2c-smbus.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static struct i2c_driver smbalert_driver = { 
	.driver = {

		.name	= "smbus_alert",

	},

	.probe_new	= smbalert_probe,

	.probe		= smbalert_probe,

	.remove		= smbalert_remove,

	.id_table	= smbalert_ids,

};