From: Yijing Wang Date: Mon, 8 Apr 2013 15:46:39 +0000 (+0000) Subject: i2c: remove CONFIG_HOTPLUG ifdefs X-Git-Tag: firefly_0821_release~3680^2~599^2~18 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e5a7074a753623505ad20289abbea7a6c8c47bf7;p=firefly-linux-kernel-4.4.55.git i2c: remove CONFIG_HOTPLUG ifdefs CONFIG_HOTPLUG is going away as an option, cleanup CONFIG_HOTPLUG ifdefs in i2c files. Signed-off-by: Yijing Wang Acked-by: Greg Kroah-Hartman Signed-off-by: Wolfram Sang --- diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index e9ac0d84a01e..6b63cc7eb71e 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -93,7 +93,6 @@ static int i2c_device_match(struct device *dev, struct device_driver *drv) return 0; } -#ifdef CONFIG_HOTPLUG /* uevent helps with hotplug: modprobe -q $(MODALIAS) */ static int i2c_device_uevent(struct device *dev, struct kobj_uevent_env *env) @@ -107,10 +106,6 @@ static int i2c_device_uevent(struct device *dev, struct kobj_uevent_env *env) return 0; } -#else -#define i2c_device_uevent NULL -#endif /* CONFIG_HOTPLUG */ - /* i2c bus recovery routines */ static int get_scl_gpio_value(struct i2c_adapter *adap) {