From 98b2e04b8af30a72ef8a24821b2d7ba3b9d08cbb Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Thu, 4 Apr 2013 14:59:14 +0100 Subject: [PATCH] --- yaml --- r: 363927 b: refs/heads/master c: dac59de2dd438a54007135ac3c2e6b6b06b5f6d6 h: refs/heads/master i: 363925: 2da30746ab17095a5266825788dc8231ecedc182 363923: 5f36b1cc954f4a41c9c79a77d760f31ec091068f 363919: 212a582f36e05a86b3673ab11dcebf320a19bffa v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedi_fops.c | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 70e8ea6a68a9..b22de55115a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0fcc9d48a0e620ee5097cbcbf8aedc5d736a01b8 +refs/heads/master: dac59de2dd438a54007135ac3c2e6b6b06b5f6d6 diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c index 64721f7f089b..71156bdfcdc8 100644 --- a/trunk/drivers/staging/comedi/comedi_fops.c +++ b/trunk/drivers/staging/comedi/comedi_fops.c @@ -153,18 +153,6 @@ static void comedi_free_board_file_info(struct comedi_file_info *info) } } -static struct comedi_file_info -*comedi_file_info_from_board_minor(unsigned minor) -{ - struct comedi_file_info *info; - - BUG_ON(minor >= COMEDI_NUM_BOARD_MINORS); - mutex_lock(&comedi_board_minor_table_lock); - info = comedi_board_minor_table[minor]; - mutex_unlock(&comedi_board_minor_table_lock); - return info; -} - static struct comedi_file_info *comedi_file_info_from_subdevice_minor(unsigned minor) { @@ -188,7 +176,10 @@ static struct comedi_device *comedi_dev_from_board_minor(unsigned minor) { struct comedi_file_info *info; - info = comedi_file_info_from_board_minor(minor); + BUG_ON(minor >= COMEDI_NUM_BOARD_MINORS); + mutex_lock(&comedi_board_minor_table_lock); + info = comedi_board_minor_table[minor]; + mutex_unlock(&comedi_board_minor_table_lock); return comedi_dev_from_file_info(info); }