staging: comedi: use comedi_dev_from_minor()

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Remove the need to export comedi_get_device_file_info() by using the
new helper comedi_dev_from_minor(). This will also allow us to make
the comedi_device_file_info struct private.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

H Hartley Sweeten and committed by

Greg Kroah-Hartman 13 years ago 4da5fa9a 85104e9b

+15 -43

4 changed files

expand all

drivers

staging

comedi

comedi_fops.c

drivers.c

kcomedilib

kcomedilib_main.c

proc.c

+8 -24

drivers/staging/comedi/comedi_fops.c

··· 1608 1608 unsigned long arg) 1609 1609 { 1610 1610 const unsigned minor = iminor(file->f_dentry->d_inode); 1611 - struct comedi_device_file_info *dev_file_info = 1612 - comedi_get_device_file_info(minor); 1613 - struct comedi_device *dev; 1611 + struct comedi_device *dev = comedi_dev_from_minor(minor); 1614 1612 int rc; 1615 1613 1616 - if (dev_file_info == NULL || dev_file_info->device == NULL) 1614 + if (!dev) 1617 1615 return -ENODEV; 1618 - dev = dev_file_info->device; 1619 1616 1620 1617 mutex_lock(&dev->mutex); 1621 1618 ··· 2085 2088 static int comedi_open(struct inode *inode, struct file *file) 2086 2089 { 2087 2090 const unsigned minor = iminor(inode); 2088 - struct comedi_device_file_info *dev_file_info = 2089 - comedi_get_device_file_info(minor); 2090 - struct comedi_device *dev = 2091 - dev_file_info ? dev_file_info->device : NULL; 2091 + struct comedi_device *dev = comedi_dev_from_minor(minor); 2092 2092 2093 - if (dev == NULL) { 2093 + if (!dev) { 2094 2094 DPRINTK("invalid minor number\n"); 2095 2095 return -ENODEV; 2096 2096 } ··· 2162 2168 static int comedi_fasync(int fd, struct file *file, int on) 2163 2169 { 2164 2170 const unsigned minor = iminor(file->f_dentry->d_inode); 2165 - struct comedi_device_file_info *dev_file_info; 2166 - struct comedi_device *dev; 2167 - dev_file_info = comedi_get_device_file_info(minor); 2171 + struct comedi_device *dev = comedi_dev_from_minor(minor); 2168 2172 2169 - if (dev_file_info == NULL) 2170 - return -ENODEV; 2171 - dev = dev_file_info->device; 2172 - if (dev == NULL) 2173 + if (!dev) 2173 2174 return -ENODEV; 2174 2175 2175 2176 return fasync_helper(fd, file, on, &dev->async_queue); ··· 2173 2184 static int comedi_close(struct inode *inode, struct file *file) 2174 2185 { 2175 2186 const unsigned minor = iminor(inode); 2187 + struct comedi_device *dev = comedi_dev_from_minor(minor); 2176 2188 struct comedi_subdevice *s = NULL; 2177 2189 int i; 2178 - struct comedi_device_file_info *dev_file_info; 2179 - struct comedi_device *dev; 2180 - dev_file_info = comedi_get_device_file_info(minor); 2181 2190 2182 - if (dev_file_info == NULL) 2183 - return -ENODEV; 2184 - dev = dev_file_info->device; 2185 - if (dev == NULL) 2191 + if (!dev) 2186 2192 return -ENODEV; 2187 2193 2188 2194 mutex_lock(&dev->mutex);

+3 -8

drivers/staging/comedi/drivers.c

··· 213 213 214 214 /* check for devices using this driver */ 215 215 for (i = 0; i < COMEDI_NUM_BOARD_MINORS; i++) { 216 - struct comedi_device_file_info *dev_file_info = 217 - comedi_get_device_file_info(i); 218 - struct comedi_device *dev; 216 + struct comedi_device *dev = comedi_dev_from_minor(i); 219 217 220 - if (dev_file_info == NULL) 218 + if (!dev) 221 219 continue; 222 - dev = dev_file_info->device; 223 220 224 221 mutex_lock(&dev->mutex); 225 222 if (dev->attached && dev->driver == driver) { ··· 831 834 struct comedi_driver *driver, unsigned long context) 832 835 { 833 836 int minor; 834 - struct comedi_device_file_info *dev_file_info; 835 837 struct comedi_device *comedi_dev; 836 838 int ret; 837 839 ··· 848 852 if (minor < 0) 849 853 return minor; 850 854 851 - dev_file_info = comedi_get_device_file_info(minor); 852 - comedi_dev = dev_file_info->device; 855 + comedi_dev = comedi_dev_from_minor(minor); 853 856 854 857 mutex_lock(&comedi_dev->mutex); 855 858 if (comedi_dev->attached)

+2 -6

drivers/staging/comedi/kcomedilib/kcomedilib_main.c

··· 42 42 43 43 struct comedi_device *comedi_open(const char *filename) 44 44 { 45 - struct comedi_device_file_info *dev_file_info; 46 45 struct comedi_device *dev; 47 46 unsigned int minor; 48 47 ··· 53 54 if (minor >= COMEDI_NUM_BOARD_MINORS) 54 55 return NULL; 55 56 56 - dev_file_info = comedi_get_device_file_info(minor); 57 - if (dev_file_info == NULL) 58 - return NULL; 59 - dev = dev_file_info->device; 57 + dev = comedi_dev_from_minor(minor); 60 58 61 - if (dev == NULL || !dev->attached) 59 + if (!dev || !dev->attached) 62 60 return NULL; 63 61 64 62 if (!try_module_get(dev->driver->module))

+2 -5

drivers/staging/comedi/proc.c

··· 49 49 "driver_name, board_name, n_subdevices"); 50 50 51 51 for (i = 0; i < COMEDI_NUM_BOARD_MINORS; i++) { 52 - struct comedi_device_file_info *dev_file_info = 53 - comedi_get_device_file_info(i); 54 - struct comedi_device *dev; 52 + struct comedi_device *dev = comedi_dev_from_minor(i); 55 53 56 - if (dev_file_info == NULL) 54 + if (!dev) 57 55 continue; 58 - dev = dev_file_info->device; 59 56 60 57 if (dev->attached) { 61 58 devices_q = 1;