Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 318089
b: refs/heads/master
c: cdb8225
h: refs/heads/master
i:
  318087: 5e7be88
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jul 19, 2012
1 parent 55bc76d commit f2a97db
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 25 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: dbd658fc0cf4be8df0c63ed1d70e631f2b606e11
refs/heads/master: cdb82250ea00574c8822366ee59d12c343e81206
24 changes: 0 additions & 24 deletions trunk/drivers/staging/comedi/drivers/cb_pcidio.c
Original file line number Diff line number Diff line change
Expand Up @@ -90,23 +90,6 @@ static const struct pcidio_board pcidio_boards[] = {
*/
#define thisboard ((const struct pcidio_board *)dev->board_ptr)

/* this structure is for data unique to this hardware driver. If
several hardware drivers keep similar information in this structure,
feel free to suggest moving the variable to the struct comedi_device struct. */
struct pcidio_private {
int data; /* currently unused */

/* used for DO readback, currently unused */
unsigned int do_readback[4]; /* up to 4 unsigned int suffice to hold 96 bits for PCI-DIO96 */

};

/*
* most drivers define the following macro to make it easy to
* access the private structure.
*/
#define devpriv ((struct pcidio_private *)dev->private)

static struct pci_dev *pcidio_find_pci_dev(struct comedi_device *dev,
struct comedi_devconfig *it)
{
Expand Down Expand Up @@ -143,13 +126,6 @@ static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
int i;
int ret;

/*
* Allocate the private structure area. alloc_private() is a
* convenient macro defined in comedidev.h.
*/
if (alloc_private(dev, sizeof(struct pcidio_private)) < 0)
return -ENOMEM;

pcidev = pcidio_find_pci_dev(dev, it);
if (!pcidev)
return -EIO;
Expand Down

0 comments on commit f2a97db

Please sign in to comment.