diff options
| author |   H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-06-24 16:55:44 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-23 14:04:59 -0700 |
| commit | 0bdab509bf9c6d838dc0a3b1d68bbf841fc20b5a (patch) | |
| tree | 0cff143ffb15d26181eb5f2d04f95d592cb63106 /drivers/staging/comedi/drivers/ni_labpc_pci.c | |
| parent | staging: comedi: drivers: introduce comedi_alloc_devpriv() (diff) | |
| download | linux-dev-0bdab509bf9c6d838dc0a3b1d68bbf841fc20b5a.tar.xz linux-dev-0bdab509bf9c6d838dc0a3b1d68bbf841fc20b5a.zip | |
staging: comedi: use comedi_alloc_devpriv()
Use the helper function to allocate memory and set the comedi_device
private data pointer.
This removes the dependency on slab.h from most of the drivers so
remove the global #include in comedidev.h and the local #include
in some of the drivers.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_labpc_pci.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_labpc_pci.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc_pci.c b/drivers/staging/comedi/drivers/ni_labpc_pci.c index 6c79237b2b5c..203a7cef7750 100644 --- a/drivers/staging/comedi/drivers/ni_labpc_pci.c +++ b/drivers/staging/comedi/drivers/ni_labpc_pci.c @@ -30,7 +30,6 @@ */ #include <linux/interrupt.h> -#include <linux/slab.h> #include <linux/pci.h> #include "../comedidev.h" @@ -72,10 +71,9 @@ static int labpc_pci_auto_attach(struct comedi_device *dev, if (ret) return ret; - devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); + devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv)); if (!devpriv) return -ENOMEM; - dev->private = devpriv; devpriv->mite = mite_alloc(pcidev); if (!devpriv->mite) |