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

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

staging: comedi: don't expose comedi_get_{read, write}_subdevice 



These two inline helper function in comedidev.h are only used in
comedi_fops.c. They return information that should only be used
by the comedi core.

Move both functions to comedi_fops.c so they aren't exposed to
the comedi drivers. Also, remove the inline tag and let the
compiler figure it out.

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 2aae0076

drivers/staging/comedi/comedi_fops.c

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

*comedi_file_info_table[COMEDI_NUM_MINORS];



static struct comedi_subdevice *

comedi_get_read_subdevice(const struct comedi_device_file_info *info)

{

	if (info->read_subdevice)

		return info->read_subdevice;

	if (info->device == NULL)

		return NULL;

	return info->device->read_subdev;

}



static struct comedi_subdevice *

comedi_get_write_subdevice(const struct comedi_device_file_info *info)

{

	if (info->write_subdevice)

		return info->write_subdevice;

	if (info->device == NULL)

		return NULL;

	return info->device->write_subdev;

}



static int resize_async_buffer(struct comedi_device *dev,

			       struct comedi_subdevice *s,

			       struct comedi_async *async, unsigned new_size)

drivers/staging/comedi/comedidev.h

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


struct comedi_device_file_info *comedi_get_device_file_info(unsigned minor);



static inline struct comedi_subdevice *comedi_get_read_subdevice(

	const struct comedi_device_file_info *info)

{

	if (info->read_subdevice)

		return info->read_subdevice;

	if (info->device == NULL)

		return NULL;

	return info->device->read_subdev;

}



static inline struct comedi_subdevice *comedi_get_write_subdevice(

	const struct comedi_device_file_info *info)

{

	if (info->write_subdevice)

		return info->write_subdevice;

	if (info->device == NULL)

		return NULL;

	return info->device->write_subdev;

}



int comedi_alloc_subdevices(struct comedi_device *, int);



void comedi_device_detach(struct comedi_device *dev);