Commit c52cf01f authored by Jean Delvare's avatar Jean Delvare
Browse files

i2c: Do not give adapters a default parent 



We don't need to give adapters a parent if they don't have one. The
driver core will put them in the virtual device directory and all will
be fine.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent fa1b2ca4

drivers/i2c/i2c-core.c

+0 −11
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <linux/i2c.h>

#include <linux/init.h>

#include <linux/idr.h>

#include <linux/platform_device.h>

#include <linux/mutex.h>

#include <linux/completion.h>

#include <linux/hardirq.h>
@@ -451,16 +450,6 @@ static int i2c_register_adapter(struct i2c_adapter *adap) 


	mutex_lock(&core_lock);



	/* Add the adapter to the driver core.

	 * If the parent pointer is not set up,

	 * we add this adapter to the host bus.

	 */

	if (adap->dev.parent == NULL) {

		adap->dev.parent = &platform_bus;

		pr_debug("I2C adapter driver [%s] forgot to specify "

			 "physical device\n", adap->name);

	}



	/* Set default timeout to 1 second if not already set */

	if (adap->timeout == 0)

		adap->timeout = HZ;