diff options
| author | Ian Abbott | 2013-11-08 16:03:41 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-11-12 01:16:45 +0100 |
| commit | 49445b9117a6e9ca9a741251784432a1da2f9919 (patch) | |
| tree | 488a1bbb62c4b8482e697e9b9aa4ebfde29ad4e2 /drivers/staging | |
| parent | staging: comedi: use file->private_data in file operations (diff) | |
| download | kernel-qcow2-linux-49445b9117a6e9ca9a741251784432a1da2f9919.tar.gz kernel-qcow2-linux-49445b9117a6e9ca9a741251784432a1da2f9919.tar.xz kernel-qcow2-linux-49445b9117a6e9ca9a741251784432a1da2f9919.zip | |
staging: comedi: remove comedi_dev_from_minor()
The `comedi_dev_from_minor()` function is no longer used, so remove it.
Calls to it have either been replaced by calls to
`comedi_dev_get_from_minor()` or by using the `private_data` member of
the open file object.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/comedi/comedi_fops.c | 28 | ||||
| -rw-r--r-- | drivers/staging/comedi/comedidev.h | 1 |
2 files changed, 0 insertions, 29 deletions
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index 08aa93a1c87c..d569484f315b 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -189,34 +189,6 @@ static struct comedi_subdevice return s; } -static struct comedi_device *comedi_dev_from_board_minor(unsigned minor) -{ - struct comedi_device *dev; - - BUG_ON(minor >= COMEDI_NUM_BOARD_MINORS); - mutex_lock(&comedi_board_minor_table_lock); - dev = comedi_board_minor_table[minor]; - mutex_unlock(&comedi_board_minor_table_lock); - return dev; -} - -static struct comedi_device *comedi_dev_from_subdevice_minor(unsigned minor) -{ - struct comedi_subdevice *s; - - s = comedi_subdevice_from_minor(minor); - return s ? s->device : NULL; -} - -struct comedi_device *comedi_dev_from_minor(unsigned minor) -{ - if (minor < COMEDI_NUM_BOARD_MINORS) - return comedi_dev_from_board_minor(minor); - else - return comedi_dev_from_subdevice_minor(minor); -} -EXPORT_SYMBOL_GPL(comedi_dev_from_minor); - static struct comedi_device *comedi_dev_get_from_board_minor(unsigned minor) { struct comedi_device *dev; diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h index a9b1468aa17c..4e7cd1443be6 100644 --- a/drivers/staging/comedi/comedidev.h +++ b/drivers/staging/comedi/comedidev.h @@ -235,7 +235,6 @@ enum comedi_minor_bits { static const unsigned COMEDI_SUBDEVICE_MINOR_SHIFT = 4; static const unsigned COMEDI_SUBDEVICE_MINOR_OFFSET = 1; -struct comedi_device *comedi_dev_from_minor(unsigned minor); struct comedi_device *comedi_dev_get_from_minor(unsigned minor); int comedi_dev_put(struct comedi_device *dev); |