diff options
| author | H Hartley Sweeten | 2015-08-10 22:13:59 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-08-15 03:35:49 +0200 |
| commit | 2be8ae5898af956560e9f722b327add05574a1f7 (patch) | |
| tree | 9197726469cfbcfba0de814043f9639a12c210fc /drivers/staging/comedi/comedi_fops.c | |
| parent | staging: comedi: comedi_fops: remove BUG_ON() in comedi_dev_get_from_board_mi... (diff) | |
| download | kernel-qcow2-linux-2be8ae5898af956560e9f722b327add05574a1f7.tar.gz kernel-qcow2-linux-2be8ae5898af956560e9f722b327add05574a1f7.tar.xz kernel-qcow2-linux-2be8ae5898af956560e9f722b327add05574a1f7.zip | |
staging: comedi: comedi_fops: absorb comedi_free_board_minor()
This function is only called by comedi_cleanup_board_minors() and the
'minor' parameter will always be < COMEDI_NUM_BOARD_MINORS.
For aesthetics, absorb the function and remove the unnecessary BUG_ON().
Split the comedi_clear_board_minor() out to clarify that the return value
is a comedi_device pointer.
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/comedi_fops.c')
| -rw-r--r-- | drivers/staging/comedi/comedi_fops.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index f7db91ca974e..fd54d098ab02 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -2774,12 +2774,6 @@ struct comedi_device *comedi_alloc_board_minor(struct device *hardware_device) return dev; } -static void comedi_free_board_minor(unsigned minor) -{ - BUG_ON(minor >= COMEDI_NUM_BOARD_MINORS); - comedi_free_board_dev(comedi_clear_board_minor(minor)); -} - void comedi_release_hardware_device(struct device *hardware_device) { int minor; @@ -2852,10 +2846,13 @@ void comedi_free_subdevice_minor(struct comedi_subdevice *s) static void comedi_cleanup_board_minors(void) { + struct comedi_device *dev; unsigned i; - for (i = 0; i < COMEDI_NUM_BOARD_MINORS; i++) - comedi_free_board_minor(i); + for (i = 0; i < COMEDI_NUM_BOARD_MINORS; i++) { + dev = comedi_clear_board_minor(i); + comedi_free_board_dev(dev); + } } static int __init comedi_init(void) |