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

Commit 85104e9b authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: comedi_fops: introduce comedi_dev_from_minor() 



A number of functions have to call comedi_get_device_file_info()
to get the comedi_device_file_info pointer for a given minor. That
pointer is only used to get the actual comedi_device pointer for
the minor.

Introduce a new helper function, comedi_dev_from_minor(), to simplify
this operation. This will also allow us to make the comedi_device_file_info
struct private.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 43bd33f2

drivers/staging/comedi/comedi_fops.c

+10 −0
Original line number Diff line number Diff line
@@ -90,6 +90,16 @@ static DEFINE_SPINLOCK(comedi_file_info_table_lock); 
static struct comedi_device_file_info

*comedi_file_info_table[COMEDI_NUM_MINORS];



struct comedi_device *comedi_dev_from_minor(unsigned minor)

{

	struct comedi_device_file_info *info;



	info = comedi_get_device_file_info(minor);



	return info ? info->device : NULL;

}

EXPORT_SYMBOL_GPL(comedi_dev_from_minor);



static struct comedi_subdevice *

comedi_get_read_subdevice(const struct comedi_device_file_info *info)

{

drivers/staging/comedi/comedidev.h

+2 −0
Original line number Diff line number Diff line
@@ -282,6 +282,8 @@ static const unsigned COMEDI_SUBDEVICE_MINOR_OFFSET = 1; 


struct comedi_device_file_info *comedi_get_device_file_info(unsigned minor);



struct comedi_device *comedi_dev_from_minor(unsigned minor);



int comedi_alloc_subdevices(struct comedi_device *, int);



void comedi_device_detach(struct comedi_device *dev);