From 910636bf1ab706c416bcfe72d07ad9169d819d1a Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 4 Feb 2013 17:13:01 -0700 Subject: [PATCH] --- yaml --- r: 354383 b: refs/heads/master c: 4a79f730179061c54d5c4ce1b59c1babbb05912f h: refs/heads/master i: 354381: cb1898085352e1681a63c94b9b2cfb67c72268c0 354379: 6c9fb1c6a7626112793b9a83888303d49910e122 354375: ad5db2fd76efa920c15f53466f549fa16736f8f0 354367: 9946f48cd69f5a58a93917e04dfc2ef5bf43e8a1 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedi_fops.c | 13 ------------- trunk/drivers/staging/comedi/comedi_internal.h | 1 - trunk/drivers/staging/comedi/drivers.c | 3 --- trunk/drivers/staging/comedi/drivers/adl_pci7x3x.c | 8 +------- 5 files changed, 2 insertions(+), 25 deletions(-) diff --git a/[refs] b/[refs] index 2620c7dc7430..f9ef3eb7b0f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd7807f96464d1053c6c5fd867461c6e64a766f1 +refs/heads/master: 4a79f730179061c54d5c4ce1b59c1babbb05912f diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c index ee127b368d57..bd89e785fe6c 100644 --- a/trunk/drivers/staging/comedi/comedi_fops.c +++ b/trunk/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/trunk/drivers/staging/comedi/comedi_internal.h b/trunk/drivers/staging/comedi/comedi_internal.h index df4c67652933..b3743135f4aa 100644 --- a/trunk/drivers/staging/comedi/comedi_internal.h +++ b/trunk/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/trunk/drivers/staging/comedi/drivers.c b/trunk/drivers/staging/comedi/drivers.c index d91b173b1f40..e57e661e1251 100644 --- a/trunk/drivers/staging/comedi/drivers.c +++ b/trunk/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/trunk/drivers/staging/comedi/drivers/adl_pci7x3x.c b/trunk/drivers/staging/comedi/drivers/adl_pci7x3x.c index 539b1d8e5235..f27f48e6e702 100644 --- a/trunk/drivers/staging/comedi/drivers/adl_pci7x3x.c +++ b/trunk/drivers/staging/comedi/drivers/adl_pci7x3x.c @@ -38,12 +38,6 @@ Author: H Hartley Sweeten 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