| Message ID | 1365471999-2396-1-git-send-email-wangyijing@huawei.com |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, Apr 09, 2013 at 09:46:39AM +0800, Yijing Wang wrote: > CONFIG_HOTPLUG is going away as an option, cleanup CONFIG_HOTPLUG > ifdefs in i2c files. > > Signed-off-by: Yijing Wang <wangyijing@huawei.com> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: Bill Pemberton <wfp5p@virginia.edu> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Apr 09, 2013 at 09:46:39AM +0800, Yijing Wang wrote: > CONFIG_HOTPLUG is going away as an option, cleanup CONFIG_HOTPLUG > ifdefs in i2c files. > > Signed-off-by: Yijing Wang <wangyijing@huawei.com> Applied to for-next, thanks! -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 991d38d..d1db97e 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -91,7 +91,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) @@ -105,10 +104,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 */ - static int i2c_device_probe(struct device *dev) { struct i2c_client *client = i2c_verify_client(dev);
CONFIG_HOTPLUG is going away as an option, cleanup CONFIG_HOTPLUG ifdefs in i2c files. Signed-off-by: Yijing Wang <wangyijing@huawei.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Bill Pemberton <wfp5p@virginia.edu> --- drivers/i2c/i2c-core.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-)