staging: comedi: remove 'comedi_autoconfig' module parameter

This module parameter is used to enable the auto config mechanism
in the comedi core. Most of the PCI, PCMCIA, and USB drivers have
been converted to use the auto config mechanism and will not attach
if it is disabled.

Since the 'comedi_autoconfig' parameter is defaulted to true, just
remove it so that the comedi drivers that use auto config will
always be able to attach.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index ee127b368d579d2fc32169f1ce8bd792f65eb7d8..bd89e785fe6c209cc99e94842dd4799ac9220fae 100644 (file)
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -58,11 +58,6 @@ MODULE_PARM_DESC(comedi_debug,
                );
 #endif
 
-bool comedi_autoconfig = true;
-module_param(comedi_autoconfig, bool, S_IRUGO);
-MODULE_PARM_DESC(comedi_autoconfig,
-                "enable drivers to auto-configure comedi devices (default 1)");
-
 static int comedi_num_legacy_minors;
 module_param(comedi_num_legacy_minors, int, S_IRUGO);
 MODULE_PARM_DESC(comedi_num_legacy_minors,
@@ -2437,14 +2432,6 @@ static int __init comedi_init(void)
                return -EINVAL;
        }
 
-       /*
-        * comedi is unusable if both comedi_autoconfig and
-        * comedi_num_legacy_minors are zero, so we might as well adjust the
-        * defaults in that case
-        */
-       if (!comedi_autoconfig && comedi_num_legacy_minors == 0)
-               comedi_num_legacy_minors = 16;
-
        memset(comedi_file_info_table, 0,
               sizeof(struct comedi_file_info *) * COMEDI_NUM_MINORS);
 

diff --git a/drivers/staging/comedi/comedi_internal.h b/drivers/staging/comedi/comedi_internal.h
index df4c6765293385f7fca8d5c7441aa997514ab0c4..b3743135f4aa8e4e26c73ef63be24c1e13d0271b 100644 (file)
--- a/drivers/staging/comedi/comedi_internal.h
+++ b/drivers/staging/comedi/comedi_internal.h
@@ -21,7 +21,6 @@ unsigned int comedi_buf_write_n_allocated(struct comedi_async *async);
 
 extern unsigned int comedi_default_buf_size_kb;
 extern unsigned int comedi_default_buf_maxsize_kb;
-extern bool comedi_autoconfig;
 
 /* drivers.c */
 

diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index d91b173b1f407b3d919080407f6185dccaadbf74..e57e661e1251909b46f3f2a567e02d0a2a077084 100644 (file)
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -410,9 +410,6 @@ int comedi_auto_config(struct device *hardware_device,
        struct comedi_device *comedi_dev;
        int ret;
 
-       if (!comedi_autoconfig)
-               return 0;
-
        if (!driver->auto_attach) {
                dev_warn(hardware_device,
                         "BUG! comedi driver '%s' has no auto_attach handler\n",

diff --git a/drivers/staging/comedi/drivers/adl_pci7x3x.c b/drivers/staging/comedi/drivers/adl_pci7x3x.c
index 539b1d8e52352cbe2f22fba986893ec780ea2f74..f27f48e6e70231cdff244a51c98e7fb7e62e52c6 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci7x3x.c
+++ b/drivers/staging/comedi/drivers/adl_pci7x3x.c
@@ -38,12 +38,6 @@ Author: H Hartley Sweeten <hsweeten@visionengravers.com>
 Updated: Thu, 02 Aug 2012 14:27:46 -0700
 Status: untested
 
-This driver only attaches using the PCI PnP auto config support
-in the comedi core. The module parameter 'comedi_autoconfig'
-must be 1 (default) to enable this feature. The COMEDI_DEVCONFIG
-ioctl, used by the comedi_config utility, is not supported by
-this driver.
-
 The PCI-7230, PCI-7432 and PCI-7433 boards also support external
 interrupt signals on digital input channels 0 and 1. The PCI-7233
 has dual-interrupt sources for change-of-state (COS) on any 16
@@ -51,7 +45,7 @@ digital input channels of LSB and for COS on any 16 digital input
 lines of MSB. Interrupts are not currently supported by this
 driver.
 
-Configuration Options: not applicable
+Configuration Options: not applicable, uses comedi PCI auto config
 */
 
 #include <linux/pci.h>