From f2a97dbb5b38ee8fd3a0b77ca6f2966042698145 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 18 Jul 2012 18:45:26 -0700
Subject: [PATCH] --- yaml --- r: 318089 b: refs/heads/master c:
 cdb82250ea00574c8822366ee59d12c343e81206 h: refs/heads/master i:   318087:
 5e7be887494e2fe0cc9a1f8bf7d1f349bbeb0215 v: v3

---
 [refs]                                        |  2 +-
 .../staging/comedi/drivers/cb_pcidio.c        | 24 -------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/[refs] b/[refs]
index 17ffc7049acc..884d513209eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbd658fc0cf4be8df0c63ed1d70e631f2b606e11
+refs/heads/master: cdb82250ea00574c8822366ee59d12c343e81206
diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcidio.c b/trunk/drivers/staging/comedi/drivers/cb_pcidio.c
index f30f6da1082f..e370d0d81bbd 100644
--- a/trunk/drivers/staging/comedi/drivers/cb_pcidio.c
+++ b/trunk/drivers/staging/comedi/drivers/cb_pcidio.c
@@ -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)
 {
@@ -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;