lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c: Let new-style drivers implement attach_adapter
  i2c: Fix sparse warnings for I2C_BOARD_INFO()
  i2c-voodoo3: Deprecate in favor of tdfxfb
  i2c-algo-pca: Fix use of uninitialized variable in debug message
This commit is contained in:
Linus Torvalds
2009-04-13 08:32:48 -07:00
parent 0ad30b8fd5 935298696f
commit 8371f87c99
5 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/feature-removal-schedule.txt
View File

@@ -428,3 +428,12 @@ Why: In 2.6.27, the semantics of /sys/bus/pci/slots was redefined to
After a reasonable transition period, we will remove the legacy After a reasonable transition period, we will remove the legacy
fakephp interface. fakephp interface.
Who: Alex Chiang <achiang@hp.com> Who: Alex Chiang <achiang@hp.com>
---------------------------
What: i2c-voodoo3 driver
When: October 2009
Why: Superseded by tdfxfb. I2C/DDC support used to live in a separate
driver but this caused driver conflicts.
Who: Jean Delvare <khali@linux-fr.org>
Krzysztof Helt <krzysztof.h1@wp.pl>

2
drivers/i2c/algos/i2c-algo-pca.c
View File

@@ -190,7 +190,7 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
int completed = 1; int completed = 1;
unsigned long timeout = jiffies + i2c_adap->timeout; unsigned long timeout = jiffies + i2c_adap->timeout;
while (pca_status(adap) != 0xf8) { while ((state = pca_status(adap)) != 0xf8) {
if (time_before(jiffies, timeout)) { if (time_before(jiffies, timeout)) {
msleep(10); msleep(10);
} else { } else {

6
drivers/i2c/busses/Kconfig
View File

@@ -604,12 +604,14 @@ comment "Graphics adapter I2C/DDC channel drivers"
depends on PCI depends on PCI
config I2C_VOODOO3 config I2C_VOODOO3
tristate "Voodoo 3" tristate "Voodoo 3 (DEPRECATED)"
depends on PCI depends on PCI
select I2C_ALGOBIT select I2C_ALGOBIT
help help
If you say yes to this option, support will be included for the If you say yes to this option, support will be included for the
Voodoo 3 I2C interface. Voodoo 3 I2C interface. This driver is deprecated and you should
use the tdfxfb driver instead, which additionally provides
framebuffer support.
This driver can also be built as a module. If so, the module This driver can also be built as a module. If so, the module
will be called i2c-voodoo3. will be called i2c-voodoo3.

3
drivers/i2c/i2c-core.c
View File

@@ -716,8 +716,7 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver)
/* new style driver methods can't mix with legacy ones */ /* new style driver methods can't mix with legacy ones */
if (is_newstyle_driver(driver)) { if (is_newstyle_driver(driver)) {
if (driver->attach_adapter || driver->detach_adapter if (driver->detach_adapter || driver->detach_client) {
|| driver->detach_client) {
printk(KERN_WARNING printk(KERN_WARNING
"i2c-core: driver [%s] is confused\n", "i2c-core: driver [%s] is confused\n",
driver->driver.name); driver->driver.name);

2
include/linux/i2c.h
View File

@@ -274,7 +274,7 @@ struct i2c_board_info {
* are provided using conventional syntax. * are provided using conventional syntax.
*/ */
#define I2C_BOARD_INFO(dev_type, dev_addr) \ #define I2C_BOARD_INFO(dev_type, dev_addr) \
.type = (dev_type), .addr = (dev_addr) .type = dev_type, .addr = (dev_addr)
/* Add-on boards should register/unregister their devices; e.g. a board /* Add-on boards should register/unregister their devices; e.g. a board