From 045365c3e1dde7306b49838a681c60bf179e6f13 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:08:19 -0400 Subject: [PATCH] --- yaml --- r: 141534 b: refs/heads/master c: 6e8131a86d6c1a9896282f572d17c447a85262ad h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/adv_pci1710.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1a3cdca69c6b..eb1356969b87 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7875a00b702e62ebafe68cd2abf96570e2d747e5 +refs/heads/master: 6e8131a86d6c1a9896282f572d17c447a85262ad diff --git a/trunk/drivers/staging/comedi/drivers/adv_pci1710.c b/trunk/drivers/staging/comedi/drivers/adv_pci1710.c index 1d392d99a40c..29eac743c8e0 100644 --- a/trunk/drivers/staging/comedi/drivers/adv_pci1710.c +++ b/trunk/drivers/staging/comedi/drivers/adv_pci1710.c @@ -266,7 +266,7 @@ static struct comedi_driver driver_pci1710 = { .offset = sizeof(struct boardtype), }; -typedef struct { +struct pci1710_private { struct pci_dev *pcidev; // ptr to PCI device char valid; // card is usable char neverending_ai; // we do unlimited AI @@ -295,9 +295,9 @@ typedef struct { unsigned int ai_timer2; short ao_data[4]; // data output buffer unsigned int cnt0_write_wait; // after a write, wait for update of the internal state -} pci1710_private; +}; -#define devpriv ((pci1710_private *)dev->private) +#define devpriv ((struct pci1710_private *)dev->private) #define this_board ((const struct boardtype *)dev->board_ptr) /* @@ -1334,7 +1334,7 @@ static int pci1710_attach(struct comedi_device * dev, struct comedi_devconfig * opt_bus = it->options[0]; opt_slot = it->options[1]; - if ((ret = alloc_private(dev, sizeof(pci1710_private))) < 0) { + if ((ret = alloc_private(dev, sizeof(struct pci1710_private))) < 0) { rt_printk(" - Allocation failed!\n"); return -ENOMEM; }