evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: drivers (core): factor out async subdevice postconfig

Browse source 
Factor the setup of an async subdevice out of postconfig(). This allows
bringing the code back a couple indents and makes the postconfig a bit
clearer.

For aesthetic reasons, rename postconfig() to __comedi_device_postconfig().

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 2013-01-21 14:36:40 -07:00 • committed by Greg Kroah-Hartman
parent 01fca37863
commit 40f58a65c9
1 changed files with 46 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
drivers/staging/comedi/drivers.c
View file

@ -171,13 +171,51 @@ static int insn_rw_emulate_bits(struct comedi_device *dev,
return 1; return 1;
} }
static int postconfig(struct comedi_device *dev) static int __comedi_device_postconfig_async(struct comedi_device *dev,
struct comedi_subdevice *s)
{ {
int i; struct comedi_async *async;
struct comedi_subdevice *s; unsigned int buf_size;
struct comedi_async *async = NULL;
int ret; int ret;
BUG_ON((s->subdev_flags & (SDF_CMD_READ | SDF_CMD_WRITE)) == 0);
BUG_ON(!s->do_cmdtest);
async = kzalloc(sizeof(*async), GFP_KERNEL);
if (!async) {
dev_warn(dev->class_dev, "failed to allocate async struct\n");
return -ENOMEM;
}
init_waitqueue_head(&async->wait_head);
async->subdevice = s;
s->async = async;
async->max_bufsize = comedi_default_buf_maxsize_kb * 1024;
buf_size = comedi_default_buf_size_kb * 1024;
if (buf_size > async->max_bufsize)
buf_size = async->max_bufsize;
if (comedi_buf_alloc(dev, s, buf_size) < 0) {
dev_warn(dev->class_dev, "Buffer allocation failed\n");
return -ENOMEM;
}
if (s->buf_change) {
ret = s->buf_change(dev, s, buf_size);
if (ret < 0)
return ret;
}
comedi_alloc_subdevice_minor(dev, s);
return 0;
}
static int __comedi_device_postconfig(struct comedi_device *dev)
{
struct comedi_subdevice *s;
int ret;
int i;
for (i = 0; i < dev->n_subdevices; i++) { for (i = 0; i < dev->n_subdevices; i++) {
s = &dev->subdevices[i]; s = &dev->subdevices[i];
@ -188,43 +226,10 @@ static int postconfig(struct comedi_device *dev)
s->len_chanlist = 1; s->len_chanlist = 1;
if (s->do_cmd) { if (s->do_cmd) {
unsigned int buf_size; ret = __comedi_device_postconfig_async(dev, s);
if (ret)
BUG_ON((s->subdev_flags & (SDF_CMD_READ |
SDF_CMD_WRITE)) == 0);
BUG_ON(!s->do_cmdtest);
async =
kzalloc(sizeof(struct comedi_async), GFP_KERNEL);
if (async == NULL) {
dev_warn(dev->class_dev,
"failed to allocate async struct\n");
return -ENOMEM;
}
init_waitqueue_head(&async->wait_head);
async->subdevice = s;
s->async = async;
async->max_bufsize =
comedi_default_buf_maxsize_kb * 1024;
buf_size = comedi_default_buf_size_kb * 1024;
if (buf_size > async->max_bufsize)
buf_size = async->max_bufsize;
async->prealloc_buf = NULL;
async->prealloc_bufsz = 0;
if (comedi_buf_alloc(dev, s, buf_size) < 0) {
dev_warn(dev->class_dev,
"Buffer allocation failed\n");
return -ENOMEM;
}
if (s->buf_change) {
ret = s->buf_change(dev, s, buf_size);
if (ret < 0)
return ret; return ret;
} }
comedi_alloc_subdevice_minor(dev, s);
}
if (!s->range_table && !s->range_table_list) if (!s->range_table && !s->range_table_list)
s->range_table = &range_unknown; s->range_table = &range_unknown;
@ -254,7 +259,7 @@ static int postconfig(struct comedi_device *dev)
/* called with module refcount incremented, decrements it */ /* called with module refcount incremented, decrements it */
static int comedi_device_postconfig(struct comedi_device *dev) static int comedi_device_postconfig(struct comedi_device *dev)
{ {
int ret = postconfig(dev); int ret = __comedi_device_postconfig(dev);
module_put(dev->driver->module); module_put(dev->driver->module);
if (ret < 0) { if (ret < 0) {
__comedi_device_detach(dev); __comedi_device_detach(dev);