staging: comedi: ke_counter: store the pci_dev in the comedi_device

Use the hw_dev pointer in the comedi_device struct to hold the
pci_dev instead of carrying it in the private data.

Since the pci_dev was the only thing in the private data, remove
the struct, the devpriv macro, and it's allocation.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/ke_counter.c b/drivers/staging/comedi/drivers/ke_counter.c
index 78eb8d44c2273b62d77c92db3ede2377c4f16154..4153977995ca6c13a855608f7d5d13e379a691f3 100644 (file)
--- a/drivers/staging/comedi/drivers/ke_counter.c
+++ b/drivers/staging/comedi/drivers/ke_counter.c
@@ -64,15 +64,6 @@ static const struct cnt_board_struct cnt_boards[] = {
 
 #define cnt_board_nbr (sizeof(cnt_boards)/sizeof(struct cnt_board_struct))
 
-/*-- device private structure -----------------------------------------------*/
-
-struct cnt_device_private {
-
-       struct pci_dev *pcidev;
-};
-
-#define devpriv ((struct cnt_device_private *)dev->private)
-
 /*-- counter write ----------------------------------------------------------*/
 
 /* This should be used only for resetting the counters; maybe it is better
@@ -164,15 +155,10 @@ static int cnt_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        unsigned long io_base;
        int error;
 
-       /* allocate device private structure */
-       error = alloc_private(dev, sizeof(struct cnt_device_private));
-       if (error < 0)
-               return error;
-
        pcidev = cnt_find_pci_dev(dev, it);
        if (!pcidev)
                return -EIO;
-       devpriv->pcidev = pcidev;
+       comedi_set_hw_dev(dev, &pcidev->dev);
        board = comedi_board(dev);
 
        dev->board_name = board->name;
@@ -219,10 +205,12 @@ static int cnt_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 static void cnt_detach(struct comedi_device *dev)
 {
-       if (devpriv && devpriv->pcidev) {
+       struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+
+       if (pcidev) {
                if (dev->iobase)
-                       comedi_pci_disable(devpriv->pcidev);
-               pci_dev_put(devpriv->pcidev);
+                       comedi_pci_disable(pcidev);
+               pci_dev_put(pcidev);
        }
 }