2013-04-09 01:47:58

by Yijing Wang

[permalink] [raw]
Subject: [PATCH] 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 <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Bill Pemberton <[email protected]>
---
drivers/i2c/i2c-core.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)

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);
--
1.7.1


2013-04-09 01:53:36

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH] i2c: remove CONFIG_HOTPLUG ifdefs

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 <[email protected]>
> Cc: Greg Kroah-Hartman <[email protected]>
> Cc: Bill Pemberton <[email protected]>

Acked-by: Greg Kroah-Hartman <[email protected]>

2013-04-09 10:17:50

by Wolfram Sang

[permalink] [raw]
Subject: Re: [PATCH] i2c: remove CONFIG_HOTPLUG ifdefs

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 <[email protected]>

Applied to for-next, thanks!