kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: jr3_pci: use comedi_alloc_spriv()

Browse source 
Use the helper function to allocate the subdevice private data. This
sets the s->private variable for us and allows the comedi core to
automatically kfree() the memory during the (*detach).

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>
This commit is contained in:
H Hartley Sweeten 2014-03-07 13:40:56 -07:00 • committed by Greg Kroah-Hartman
parent 050389f5eb
commit 6fe9bb6705
1 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
drivers/staging/comedi/drivers/jr3_pci.c
View file

@ -687,12 +687,10 @@ static int jr3_pci_auto_attach(struct comedi_device *dev,
s->n_chan = 8 * 7 + 2;
s->insn_read = jr3_pci_ai_insn_read;
p = kzalloc(sizeof(*p), GFP_KERNEL);
p = comedi_alloc_spriv(s, sizeof(*p));
if (p) {
int j;
s->private = p;
p->channel = &devpriv->iobase->channel[i].data;
dev_dbg(dev->class_dev, "p->channel %p %p (%tx)\n",
p->channel, devpriv->iobase,
@ -780,16 +778,11 @@ static int jr3_pci_auto_attach(struct comedi_device *dev,
static void jr3_pci_detach(struct comedi_device *dev)
{
int i;
struct jr3_pci_dev_private *devpriv = dev->private;
if (devpriv) {
del_timer_sync(&devpriv->timer);
if (dev->subdevices) {
for (i = 0; i < devpriv->n_channels; i++)
kfree(dev->subdevices[i].private);
}
if (devpriv->iobase)
iounmap(devpriv->iobase);
}