Merge branch 'linus' into tracing/core

Merge reason: merge latest tracing fixes to avoid conflicts in
              kernel/trace/trace_events_filter.c with upcoming change

Signed-off-by: Ingo Molnar <mingo@elte.hu>

3 files changed, 6 insertions, 5 deletions

diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c
index f68e5f8e23ee..6318f7ddc1d4 100644
--- a/drivers/i2c/algos/i2c-algo-pca.c
+++ b/drivers/i2c/algos/i2c-algo-pca.c
@@ -190,7 +190,7 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
         int completed = 1;
         unsigned long timeout = jiffies + i2c_adap->timeout;
 
-        while (pca_status(adap) != 0xf8) {
+        while ((state = pca_status(adap)) != 0xf8) {
                 if (time_before(jiffies, timeout)) {
                         msleep(10);
                 } else {
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 94eae5c3cbc7..a48c8aee0218 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -604,12 +604,14 @@ comment "Graphics adapter I2C/DDC channel drivers"
         depends on PCI
 
 config I2C_VOODOO3
-        tristate "Voodoo 3"
+        tristate "Voodoo 3 (DEPRECATED)"
         depends on PCI
         select I2C_ALGOBIT
         help
           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
           will be called i2c-voodoo3.
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index b6f3a0de6ca2..85e2e919d1cd 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -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 */
         if (is_newstyle_driver(driver)) {
-                if (driver->attach_adapter || driver->detach_adapter
-                                || driver->detach_client) {
+                if (driver->detach_adapter || driver->detach_client) {
                         printk(KERN_WARNING
                                         "i2c-core: driver [%s] is confused\n",
                                         driver->driver.name);