aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorH Hartley Sweeten2012-10-24 16:32:03 -0700
committerGreg Kroah-Hartman2012-10-24 19:35:49 -0700
commit8545d2a8117f9d8cff9e066310125f6e93503edb (patch)
tree28d3974d9eb4cacc38b75ceb66ee3a6cbaf09a2f /drivers
parent3bb18724d6f6a26cbb6ec5a9ef45aed6f1200a43 (diff)
staging: comedi: cb_pcidda: remove the private data 'status'
This variable in the private data is only used to output some kernel noise during the attach about certian board types not being fully tested. All of the boards supported by this driver share a common register map and should be compatible. Just remove the 'status' and the noise. 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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/comedi/drivers/cb_pcidda.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c
index 69ca074d1067..2af32783e00b 100644
--- a/drivers/staging/comedi/drivers/cb_pcidda.c
+++ b/drivers/staging/comedi/drivers/cb_pcidda.c
@@ -132,14 +132,6 @@ static const struct comedi_lrange cb_pcidda_ranges = {
*/
struct cb_pcidda_board {
const char *name;
- char status; /* Driver status: */
-
- /*
- * 0 - tested
- * 1 - manual read, not tested
- * 2 - manual not read
- */
-
unsigned short device_id;
int ao_chans;
int ao_bits;
@@ -148,42 +140,36 @@ struct cb_pcidda_board {
static const struct cb_pcidda_board cb_pcidda_boards[] = {
{
.name = "pci-dda02/12",
- .status = 1,
.device_id = PCI_DEVICE_ID_DDA02_12,
.ao_chans = 2,
.ao_bits = 12,
},
{
.name = "pci-dda04/12",
- .status = 1,
.device_id = PCI_DEVICE_ID_DDA04_12,
.ao_chans = 4,
.ao_bits = 12,
},
{
.name = "pci-dda08/12",
- .status = 0,
.device_id = PCI_DEVICE_ID_DDA08_12,
.ao_chans = 8,
.ao_bits = 12,
},
{
.name = "pci-dda02/16",
- .status = 2,
.device_id = PCI_DEVICE_ID_DDA02_16,
.ao_chans = 2,
.ao_bits = 16,
},
{
.name = "pci-dda04/16",
- .status = 2,
.device_id = PCI_DEVICE_ID_DDA04_16,
.ao_chans = 4,
.ao_bits = 16,
},
{
.name = "pci-dda08/16",
- .status = 0,
.device_id = PCI_DEVICE_ID_DDA08_16,
.ao_chans = 8,
.ao_bits = 16,
@@ -488,12 +474,6 @@ static int cb_pcidda_attach_pci(struct comedi_device *dev,
dev->iobase = pci_resource_start(pcidev, 3);
iobase_8255 = pci_resource_start(pcidev, 2);
- if (thisboard->status == 2)
- printk
- ("WARNING: DRIVER FOR THIS BOARD NOT CHECKED WITH MANUAL. "
- "WORKS ASSUMING FULL COMPATIBILITY WITH PCI-DDA08/12. "
- "PLEASE REPORT USAGE TO <ivanmr@altavista.com>.\n");
-
ret = comedi_alloc_subdevices(dev, 3);
if (ret)
return ret;