Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  i2c-viapro: Don't log nacks
  i2c/pca954x: Remove __devinit and __devexit from probe and remove functions
  MAINTAINERS: Add maintainer for PCA9541 I2C bus master selector driver
  i2c/mux: Driver for PCA9541 I2C Master Selector
  i2c: Optimize function i2c_detect()
  i2c: Discard warning message on device instantiation from user-space
  i2c-amd8111: Add proper error handling
  i2c: Change to new flag variable
  i2c: Remove unneeded inclusions of <linux/i2c-id.h>
  i2c: Let i2c_parent_is_i2c_adapter return the parent adapter
  i2c: Simplify i2c_parent_is_i2c_adapter
  i2c-pca-platform: Change device name of request_irq
  i2c: Fix Kconfig dependencies

1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index 5f3a52d517c3..cec0f3ba97f8 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -192,13 +192,12 @@ static int i2cdev_check(struct device *dev, void *addrp)
 /* walk up mux tree */
 static int i2cdev_check_mux_parents(struct i2c_adapter *adapter, int addr)
 {
+        struct i2c_adapter *parent = i2c_parent_is_i2c_adapter(adapter);
         int result;
 
         result = device_for_each_child(&adapter->dev, &addr, i2cdev_check);
-
-        if (!result && i2c_parent_is_i2c_adapter(adapter))
-                result = i2cdev_check_mux_parents(
-                                    to_i2c_adapter(adapter->dev.parent), addr);
+        if (!result && parent)
+                result = i2cdev_check_mux_parents(parent, addr);
 
         return result;
 }
@@ -222,11 +221,11 @@ static int i2cdev_check_mux_children(struct device *dev, void *addrp)
    driver bound to it, as NOT busy. */
 static int i2cdev_check_addr(struct i2c_adapter *adapter, unsigned int addr)
 {
+        struct i2c_adapter *parent = i2c_parent_is_i2c_adapter(adapter);
         int result = 0;
 
-        if (i2c_parent_is_i2c_adapter(adapter))
-                result = i2cdev_check_mux_parents(
-                                    to_i2c_adapter(adapter->dev.parent), addr);
+        if (parent)
+                result = i2cdev_check_mux_parents(parent, addr);
 
         if (!result)
                 result = device_for_each_child(&adapter->dev, &addr,