From 5673f4e31f845b229f063b7813f9ac3043be1699 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 19 Dec 2012 15:36:00 -0700 Subject: [PATCH] --- yaml --- r: 353927 b: refs/heads/master c: 87b1ad7a80d0a297448893e06f37c775951119d0 h: refs/heads/master i: 353925: 01c373b7b13ad83222e49a14f059c80209741b1a 353923: 8d4da8aedd0716303849ce9c5275887d6f260a9a 353919: 1d28a6fae4a26538f33a1849fea9678545d81537 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedi_fops.c | 24 +++++++++++----------- trunk/drivers/staging/comedi/comedidev.h | 2 -- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 302ef38a26db..9661a0f2f5f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4da5fa9a439fda3019585aecab44462fd641b6f8 +refs/heads/master: 87b1ad7a80d0a297448893e06f37c775951119d0 diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c index 3945b5f0e5fa..1950f1ea6bb4 100644 --- a/trunk/drivers/staging/comedi/comedi_fops.c +++ b/trunk/drivers/staging/comedi/comedi_fops.c @@ -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); diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h index fc2c17925381..3e1fd84f2090 100644 --- a/trunk/drivers/staging/comedi/comedidev.h +++ b/trunk/drivers/staging/comedi/comedidev.h @@ -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);