From: H Hartley Sweeten Date: Mon, 25 Jun 2012 22:15:58 +0000 (-0700) Subject: staging: comedi: cb_das16_cs: remove CONFIG_PCMCIA check X-Git-Tag: firefly_0821_release~3680^2~2356^2~547 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=726dd505511d7be7234f3a2135b82b37d9026992;p=firefly-linux-kernel-4.4.55.git staging: comedi: cb_das16_cs: remove CONFIG_PCMCIA check The Kconfig ensures that this driver can only be build it PCMCIA is enabled. Remove the unneeded '#if defined (CONFIG_PCMCIA) ,,,' and the '#else' code. Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Cc: Frank Mori Hess Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c index 6866e25543d1..1fd44602940e 100644 --- a/drivers/staging/comedi/drivers/cb_das16_cs.c +++ b/drivers/staging/comedi/drivers/cb_das16_cs.c @@ -629,8 +629,6 @@ static int das16cs_timer_insn_config(struct comedi_device *dev, ======================================================================*/ -#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE) - static void das16cs_pcmcia_config(struct pcmcia_device *link); static void das16cs_pcmcia_release(struct pcmcia_device *link); static int das16cs_pcmcia_suspend(struct pcmcia_device *p_dev); @@ -813,18 +811,3 @@ void __exit cleanup_module(void) exit_das16cs_pcmcia_cs(); comedi_driver_unregister(&driver_das16cs); } - -#else -static int __init driver_das16cs_init_module(void) -{ - return comedi_driver_register(&driver_das16cs); -} - -static void __exit driver_das16cs_cleanup_module(void) -{ - comedi_driver_unregister(&driver_das16cs); -} - -module_init(driver_das16cs_init_module); -module_exit(driver_das16cs_cleanup_module); -#endif /* CONFIG_PCMCIA */