aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorYijing Wang <wangyijing@huawei.com>2013-04-08 11:46:39 -0400
committerWolfram Sang <wsa@the-dreams.de>2013-04-09 05:57:55 -0400
commite5a7074a753623505ad20289abbea7a6c8c47bf7 (patch)
treea506f6b24b5a8441d9a942401b2a6685925aa958 /drivers/i2c
parent85747311ecb6167c989093c64a13807366fdd3a9 (diff)
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 <wangyijing@huawei.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/i2c-core.c5
1 files changed, 0 insertions, 5 deletions
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)
93 return 0; 93 return 0;
94} 94}
95 95
96#ifdef CONFIG_HOTPLUG
97 96
98/* uevent helps with hotplug: modprobe -q $(MODALIAS) */ 97/* uevent helps with hotplug: modprobe -q $(MODALIAS) */
99static int i2c_device_uevent(struct device *dev, struct kobj_uevent_env *env) 98static 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)
107 return 0; 106 return 0;
108} 107}
109 108
110#else
111#define i2c_device_uevent NULL
112#endif /* CONFIG_HOTPLUG */
113
114/* i2c bus recovery routines */ 109/* i2c bus recovery routines */
115static int get_scl_gpio_value(struct i2c_adapter *adap) 110static int get_scl_gpio_value(struct i2c_adapter *adap)
116{ 111{