staging: comedi: remove inline alloc_private()

[deliverable/linux.git] / drivers / staging / comedi / drivers / amplc_dio200.c

diff --git a/drivers/staging/comedi/drivers/amplc_dio200.c b/drivers/staging/comedi/drivers/amplc_dio200.c
index 556c63304324f79ea07bad69332db2eea13c772b..35cd3cbb3bec359456d80c1550193838b32fdcd0 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_dio200.c
+++ b/drivers/staging/comedi/drivers/amplc_dio200.c
@@ -1339,10 +1339,10 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
        dev_info(dev->class_dev, DIO200_DRIVER_NAME ": attach\n");
 
-       ret = alloc_private(dev, sizeof(*devpriv));
-       if (ret)
-               return ret;
-       devpriv = dev->private;
+       devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+       if (!devpriv)
+               return -ENOMEM;
+       dev->private = devpriv;
 
        /* Process options and reserve resources according to bus type. */
        if (is_isa_board(thisboard)) {
@@ -1378,7 +1378,6 @@ static int __devinit dio200_attach_pci(struct comedi_device *dev,
                                       struct pci_dev *pci_dev)
 {
        struct dio200_private *devpriv;
-       int ret;
 
        if (!DO_PCI)
                return -EINVAL;
@@ -1386,10 +1385,10 @@ static int __devinit dio200_attach_pci(struct comedi_device *dev,
        dev_info(dev->class_dev, DIO200_DRIVER_NAME ": attach pci %s\n",
                 pci_name(pci_dev));
 
-       ret = alloc_private(dev, sizeof(*devpriv));
-       if (ret)
-               return ret;
-       devpriv = dev->private;
+       devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+       if (!devpriv)
+               return -ENOMEM;
+       dev->private = devpriv;
 
        dev->board_ptr = dio200_find_pci_board(pci_dev);
        if (dev->board_ptr == NULL) {