Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317628
b: refs/heads/master
c: 9795f56
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jul 6, 2012
1 parent bf1a83a commit c9d5f55
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 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: 327be979c1819d4404927af4b6e3ba8f22a4fa07
refs/heads/master: 9795f562bd72387da8c9e5bc99e2cce869aa1bc1
8 changes: 0 additions & 8 deletions trunk/drivers/staging/comedi/drivers/cb_pcidas.c
Original file line number Diff line number Diff line change
Expand Up @@ -1650,9 +1650,6 @@ static int cb_pcidas_attach(struct comedi_device *dev,
int i;
int ret;

/*
* Allocate the private structure area.
*/
if (alloc_private(dev, sizeof(struct cb_pcidas_private)) < 0)
return -ENOMEM;
devpriv = dev->private;
Expand All @@ -1668,9 +1665,6 @@ static int cb_pcidas_attach(struct comedi_device *dev,
thisboard->name, devpriv->pci_dev->bus->number,
PCI_SLOT(devpriv->pci_dev->devfn));

/*
* Enable PCI device and reserve I/O ports.
*/
if (comedi_pci_enable(devpriv->pci_dev, "cb_pcidas")) {
dev_err(dev->class_dev,
"Failed to enable PCI device and request regions\n");
Expand All @@ -1696,7 +1690,6 @@ static int cb_pcidas_attach(struct comedi_device *dev,
outl(INTCSR_INBOX_INTR_STATUS,
devpriv->s5933_config + AMCC_OP_REG_INTCSR);

/* get irq */
if (request_irq(devpriv->pci_dev->irq, cb_pcidas_interrupt,
IRQF_SHARED, "cb_pcidas", dev)) {
dev_dbg(dev->class_dev, "unable to allocate irq %d\n",
Expand All @@ -1705,7 +1698,6 @@ static int cb_pcidas_attach(struct comedi_device *dev,
}
dev->irq = devpriv->pci_dev->irq;

/* Initialize dev->board_name */
dev->board_name = thisboard->name;

ret = comedi_alloc_subdevices(dev, 7);
Expand Down

0 comments on commit c9d5f55

Please sign in to comment.