Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337261
b: refs/heads/master
c: 8545d2a
h: refs/heads/master
i:
  337259: 4ec690f
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Oct 25, 2012
1 parent 5c521b9 commit 0d77ed3
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 21 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3bb18724d6f6a26cbb6ec5a9ef45aed6f1200a43
refs/heads/master: 8545d2a8117f9d8cff9e066310125f6e93503edb
20 changes: 0 additions & 20 deletions trunk/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 0d77ed3

Please sign in to comment.