Skip to content

Commit

Permalink
staging: comedi: cb_das16_cs: remove CONFIG_PCMCIA check
Browse files Browse the repository at this point in the history
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 <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jun 26, 2012
1 parent a771988 commit 726dd50
Showing 1 changed file with 0 additions and 17 deletions.
17 changes: 0 additions & 17 deletions drivers/staging/comedi/drivers/cb_das16_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 */

0 comments on commit 726dd50

Please sign in to comment.