From: Bill Pemberton <wfp5p@virginia.edu>
Date: Tue, 17 Mar 2009 02:08:51 +0000 (-0400)
Subject: Staging: comedi: Remove pci_dio_private typedef
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4cb133565aaf9b04f4fb6af5e5200982258b107c;p=linux-beck.git

Staging: comedi: Remove pci_dio_private typedef

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c b/drivers/staging/comedi/drivers/adv_pci_dio.c
index 27f37371a7e9..2604425c3a0f 100644
--- a/drivers/staging/comedi/drivers/adv_pci_dio.c
+++ b/drivers/staging/comedi/drivers/adv_pci_dio.c
@@ -328,10 +328,10 @@ static struct comedi_driver driver_pci_dio = {
       attach:pci_dio_attach,
       detach:pci_dio_detach
 };
-typedef struct pci_dio_private_st pci_dio_private;
-struct pci_dio_private_st {
-	pci_dio_private *prev;	/*  previous private struct */
-	pci_dio_private *next;	/*  next private struct */
+
+struct pci_dio_private {
+	struct pci_dio_private *prev;	/*  previous private struct */
+	struct pci_dio_private *next;	/*  next private struct */
 	struct pci_dev *pcidev;	/*  pointer to board's pci_dev */
 	char valid;		/*  card is usable */
 	char GlobalIrqEnabled;	/*  1= any IRQ source is enabled */
@@ -349,9 +349,9 @@ struct pci_dio_private_st {
 	unsigned short IDIFiltrHigh[8];	/*  IDI's filter value high signal */
 };
 
-static pci_dio_private *pci_priv = NULL;	/* list of allocated cards */
+static struct pci_dio_private *pci_priv = NULL;	/* list of allocated cards */
 
-#define devpriv ((pci_dio_private *)dev->private)
+#define devpriv ((struct pci_dio_private *)dev->private)
 #define this_board ((const struct dio_boardtype *)dev->board_ptr)
 
 /*
@@ -860,7 +860,7 @@ static int pci_dio_add_do(struct comedi_device * dev, struct comedi_subdevice *
 static int CheckAndAllocCard(struct comedi_device * dev, struct comedi_devconfig * it,
 	struct pci_dev *pcidev)
 {
-	pci_dio_private *pr, *prev;
+	struct pci_dio_private *pr, *prev;
 
 	for (pr = pci_priv, prev = NULL; pr != NULL; prev = pr, pr = pr->next) {
 		if (pr->pcidev == pcidev) {
@@ -892,7 +892,7 @@ static int pci_dio_attach(struct comedi_device * dev, struct comedi_devconfig *
 
 	rt_printk("comedi%d: adv_pci_dio: ", dev->minor);
 
-	if ((ret = alloc_private(dev, sizeof(pci_dio_private))) < 0) {
+	if ((ret = alloc_private(dev, sizeof(struct pci_dio_private))) < 0) {
 		rt_printk(", Error: Cann't allocate private memory!\n");
 		return -ENOMEM;
 	}