From: Jean Delvare <khali@linux-fr.org>
Date: Sun, 24 Oct 2010 16:16:57 +0000 (+0200)
Subject: i2c: Simplify i2c_parent_is_i2c_adapter
X-Git-Tag: v2.6.37-rc1~143^2~10
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=d582963a027fd63f8dfc97a0bf3654d4380e34ce

i2c: Simplify i2c_parent_is_i2c_adapter

Only i2c devices can have their type set to i2c_adapter_type, so
testing the bus type is redundant.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Michael Lawnick <ml.lawnick@gmx.de>
---

diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 4bae0b72ed3c..9391a491501a 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -387,7 +387,6 @@ static inline void i2c_set_adapdata(struct i2c_adapter *dev, void *data)
 static inline int 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;
 }