Skip to content

Commit

Permalink
staging: comedi: cb_pcidda: remove the private data 'status'
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Oct 25, 2012
1 parent 3bb1872 commit 8545d2a
Showing 1 changed file with 0 additions and 20 deletions.
20 changes: 0 additions & 20 deletions drivers/staging/comedi/drivers/cb_pcidda.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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,
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 8545d2a

Please sign in to comment.