Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49445b91 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

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: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e5d670dc

drivers/staging/comedi/comedi_fops.c

+0 −28
Original line number Diff line number Diff line
@@ -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;

drivers/staging/comedi/comedidev.h

+0 −1
Original line number Diff line number Diff line
@@ -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);