evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pcmcia: remove CONFIG_HOTPLUG ifdefs

Browse source 
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@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bill Pemberton 2012-11-19 13:19:13 -05:00 • committed by Greg Kroah-Hartman
parent 7e4b9d0bb2
commit 13ee2b943c
1 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/pcmcia/ds.c
View file

@ -920,8 +920,6 @@ static int pcmcia_bus_match(struct device *dev, struct device_driver *drv)
return 0; return 0;
} }
#ifdef CONFIG_HOTPLUG
static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env) static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
{ {
struct pcmcia_device *p_dev; struct pcmcia_device *p_dev;
@ -962,15 +960,6 @@ static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
return 0; return 0;
} }
#else
static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
{
return -ENODEV;
}
#endif
/************************ runtime PM support ***************************/ /************************ runtime PM support ***************************/
static int pcmcia_dev_suspend(struct device *dev, pm_message_t state); static int pcmcia_dev_suspend(struct device *dev, pm_message_t state);