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

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

staging: comedi: comedi_fops: don't export comedi_get_device_file_info() 



This function is now only used in comedi_fops.c and does not need
to be exported.

Make it static and move it to avoid forward declarations.

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 4da5fa9a

drivers/staging/comedi/comedi_fops.c

+12 −12
Original line number Diff line number Diff line
@@ -90,6 +90,18 @@ static DEFINE_SPINLOCK(comedi_file_info_table_lock); 
static struct comedi_device_file_info

*comedi_file_info_table[COMEDI_NUM_MINORS];



static struct comedi_device_file_info *

comedi_get_device_file_info(unsigned minor)

{

	struct comedi_device_file_info *info;



	BUG_ON(minor >= COMEDI_NUM_MINORS);

	spin_lock(&comedi_file_info_table_lock);

	info = comedi_file_info_table[minor];

	spin_unlock(&comedi_file_info_table_lock);

	return info;

}



struct comedi_device *comedi_dev_from_minor(unsigned minor)

{

	struct comedi_device_file_info *info;
@@ -2540,15 +2552,3 @@ void comedi_free_subdevice_minor(struct comedi_subdevice *s) 
	}

	kfree(info);

}
 


struct comedi_device_file_info *comedi_get_device_file_info(unsigned minor)

{

	struct comedi_device_file_info *info;



	BUG_ON(minor >= COMEDI_NUM_MINORS);

	spin_lock(&comedi_file_info_table_lock);

	info = comedi_file_info_table[minor];

	spin_unlock(&comedi_file_info_table_lock);

	return info;

}

EXPORT_SYMBOL_GPL(comedi_get_device_file_info);

drivers/staging/comedi/comedidev.h

+0 −2
Original line number Diff line number Diff line
@@ -280,8 +280,6 @@ enum comedi_minor_bits { 
static const unsigned COMEDI_SUBDEVICE_MINOR_SHIFT = 4;

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);