Commit 9c2bdac4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c: Prevent log spam on some DVB adapters
  i2c: Add missing kerneldoc descriptions
  i2c: Fix device_init_wakeup place
parents 41108eb1 4329cf86

drivers/i2c/i2c-core.c

+10 −8
Original line number Diff line number Diff line
@@ -108,6 +108,9 @@ static int i2c_device_probe(struct device *dev) 
	if (!driver->probe || !driver->id_table)

		return -ENODEV;

	client->driver = driver;

	if (!device_can_wakeup(&client->dev))

		device_init_wakeup(&client->dev,

					client->flags & I2C_CLIENT_WAKE);

	dev_dbg(dev, "probe\n");



	status = driver->probe(client, i2c_match_id(driver->id_table, client));
@@ -262,9 +265,8 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info) 
	client->adapter = adap;



	client->dev.platform_data = info->platform_data;

	device_init_wakeup(&client->dev, info->flags & I2C_CLIENT_WAKE);



	client->flags = info->flags & ~I2C_CLIENT_WAKE;

	client->flags = info->flags;

	client->addr = info->addr;

	client->irq = info->irq;
@@ -1188,7 +1190,7 @@ int i2c_probe(struct i2c_adapter *adapter, 
		 && address_data->normal_i2c[0] == I2C_CLIENT_END)

			return 0;



		dev_warn(&adapter->dev, "SMBus Quick command not supported, "

		dev_dbg(&adapter->dev, "SMBus Quick command not supported, "

			"can't probe for chips\n");

		return -EOPNOTSUPP;

	}
@@ -1350,6 +1352,10 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver) 
		}

	}



	/* Stop here if the classes do not match */

	if (!(adapter->class & driver->class))

		goto exit_free;



	/* Stop here if we can't use SMBUS_QUICK */

	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_QUICK)) {

		if (address_data->probe[0] == I2C_CLIENT_END
@@ -1362,10 +1368,6 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver) 
		goto exit_free;

	}



	/* Stop here if the classes do not match */

	if (!(adapter->class & driver->class))

		goto exit_free;



	/* Probe entries are done second, and are not affected by ignore

	   entries either */

	for (i = 0; address_data->probe[i] != I2C_CLIENT_END; i += 2) {

include/linux/i2c.h

+12 −0
Original line number Diff line number Diff line
@@ -97,7 +97,19 @@ extern s32 i2c_smbus_write_i2c_block_data(struct i2c_client * client, 


/**

 * struct i2c_driver - represent an I2C device driver

 * @id: Unique driver ID (optional)

 * @class: What kind of i2c device we instantiate (for detect)

 * @attach_adapter: Callback for bus addition (for legacy drivers)

 * @detach_adapter: Callback for bus removal (for legacy drivers)

 * @detach_client: Callback for device removal (for legacy drivers)

 * @probe: Callback for device binding (new-style drivers)

 * @remove: Callback for device unbinding (new-style drivers)

 * @shutdown: Callback for device shutdown

 * @suspend: Callback for device suspend

 * @resume: Callback for device resume

 * @command: Callback for bus-wide signaling (optional)

 * @driver: Device driver model driver

 * @id_table: List of I2C devices supported by this driver

 * @detect: Callback for device detection

 * @address_data: The I2C addresses to probe, ignore or force (for detect)

 * @clients: List of detected clients we created (for i2c-core use only)