1 files changed, 8 insertions, 6 deletions

diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 4bae0b72ed3c..889b35abaeda 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -384,11 +384,15 @@ static inline void i2c_set_adapdata(struct i2c_adapter *dev, void *data)
         dev_set_drvdata(&dev->dev, data);
 }
 
-static inline int i2c_parent_is_i2c_adapter(const struct i2c_adapter *adapter)
+static inline struct i2c_adapter *
+i2c_parent_is_i2c_adapter(const struct i2c_adapter *adapter)
 {
-        return adapter->dev.parent != NULL
-                && adapter->dev.parent->bus == &i2c_bus_type
-                && adapter->dev.parent->type == &i2c_adapter_type;
+        struct device *parent = adapter->dev.parent;
+
+        if (parent != NULL && parent->type == &i2c_adapter_type)
+                return to_i2c_adapter(parent);
+        else
+                return NULL;
 }
 
 /* Adapter locking functions, exported for shared pin cases */
@@ -403,8 +407,6 @@ void i2c_unlock_adapter(struct i2c_adapter *);
 
 /* i2c adapter classes (bitmask) */
 #define I2C_CLASS_HWMON         (1<<0)  /* lm_sensors, ... */
-#define I2C_CLASS_TV_ANALOG     (1<<1)  /* bttv + friends */
-#define I2C_CLASS_TV_DIGITAL    (1<<2)  /* dvb cards */
 #define I2C_CLASS_DDC           (1<<3)  /* DDC bus on graphics adapters */
 #define I2C_CLASS_SPD           (1<<7)  /* SPD EEPROMs and similar */