On Tue, 20 Nov 2012 09:58:01 -0500, Bill Pemberton wrote:
> Remove conditional code based on CONFIG_HOTPLUG being false. It's
> always on now in preparation of it going away as an option.
>
> Signed-off-by: Bill Pemberton <wfp5p@xxxxxxxxxxxx>
> ---
>
> The is a resend of patch 002/493 that retains a comment inadvertently
> removed in the first version.
>
> ---
> drivers/i2c/i2c-core.c | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
> index a7edf98..ff43d3b 100644
> --- a/drivers/i2c/i2c-core.c
> +++ b/drivers/i2c/i2c-core.c
> @@ -86,8 +86,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)
> {
> @@ -100,10 +98,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);
Looks reasonable.
Acked-by: Jean Delvare <khali@xxxxxxxxxxxx>
--
Jean Delvare
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
