leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Staging: comedi: Remove jr3_pci_dev_private typedef

Browse Source 
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Bill Pemberton 2009-03-16 22:15:24 -04:00 committed by Greg Kroah-Hartman
parent 0e99a2b9a2
commit 217fbbbc74
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/staging/comedi/drivers/jr3_pci.c
View File

@ -127,13 +127,15 @@ static DEFINE_PCI_DEVICE_TABLE(jr3_pci_pci_table) = {
MODULE_DEVICE_TABLE(pci, jr3_pci_pci_table); MODULE_DEVICE_TABLE(pci, jr3_pci_pci_table);
typedef struct { struct jr3_pci_dev_private {
struct pci_dev *pci_dev; struct pci_dev *pci_dev;
int pci_enabled; int pci_enabled;
volatile struct jr3_t *iobase; volatile struct jr3_t *iobase;
int n_channels; int n_channels;
struct timer_list timer; struct timer_list timer;
} jr3_pci_dev_private; };
typedef struct { typedef struct {
int min; int min;
@ -388,7 +390,7 @@ static int jr3_pci_ai_insn_read(struct comedi_device * dev, struct comedi_subdev
static void jr3_pci_open(struct comedi_device * dev) static void jr3_pci_open(struct comedi_device * dev)
{ {
int i; int i;
jr3_pci_dev_private *devpriv = dev->private; struct jr3_pci_dev_private *devpriv = dev->private;
printk("jr3_pci_open\n"); printk("jr3_pci_open\n");
for (i = 0; i < devpriv->n_channels; i++) { for (i = 0; i < devpriv->n_channels; i++) {
@ -458,7 +460,7 @@ static int jr3_download_firmware(struct comedi_device * dev, const u8 * data,
result = -ENODATA; result = -ENODATA;
} else { } else {
int i; int i;
jr3_pci_dev_private *p = dev->private; struct jr3_pci_dev_private *p = dev->private;
for (i = 0; i < p->n_channels; i++) { for (i = 0; i < p->n_channels; i++) {
jr3_pci_subdev_private *sp; jr3_pci_subdev_private *sp;
@ -738,7 +740,7 @@ static void jr3_pci_poll_dev(unsigned long data)
{ {
unsigned long flags; unsigned long flags;
struct comedi_device *dev = (struct comedi_device *) data; struct comedi_device *dev = (struct comedi_device *) data;
jr3_pci_dev_private *devpriv = dev->private; struct jr3_pci_dev_private *devpriv = dev->private;
unsigned long now; unsigned long now;
int delay; int delay;
int i; int i;
@ -775,7 +777,7 @@ static int jr3_pci_attach(struct comedi_device * dev, struct comedi_devconfig *
int result = 0; int result = 0;
struct pci_dev *card = NULL; struct pci_dev *card = NULL;
int opt_bus, opt_slot, i; int opt_bus, opt_slot, i;
jr3_pci_dev_private *devpriv; struct jr3_pci_dev_private *devpriv;
printk("comedi%d: jr3_pci\n", dev->minor); printk("comedi%d: jr3_pci\n", dev->minor);
@ -788,7 +790,7 @@ static int jr3_pci_attach(struct comedi_device * dev, struct comedi_devconfig *
return -EINVAL; return -EINVAL;
} }
result = alloc_private(dev, sizeof(jr3_pci_dev_private)); result = alloc_private(dev, sizeof(struct jr3_pci_dev_private));
if (result < 0) { if (result < 0) {
return -ENOMEM; return -ENOMEM;
} }
@ -943,7 +945,7 @@ static int jr3_pci_attach(struct comedi_device * dev, struct comedi_devconfig *
static int jr3_pci_detach(struct comedi_device * dev) static int jr3_pci_detach(struct comedi_device * dev)
{ {
int i; int i;
jr3_pci_dev_private *devpriv = dev->private; struct jr3_pci_dev_private *devpriv = dev->private;
printk("comedi%d: jr3_pci: remove\n", dev->minor); printk("comedi%d: jr3_pci: remove\n", dev->minor);
if (devpriv) { if (devpriv) {