diff options
Diffstat (limited to 'drivers/staging/comedi/proc.c')
| -rw-r--r-- | drivers/staging/comedi/proc.c | 54 | 
1 files changed, 27 insertions, 27 deletions
diff --git a/drivers/staging/comedi/proc.c b/drivers/staging/comedi/proc.c index ade00035d3b..91dea25b572 100644 --- a/drivers/staging/comedi/proc.c +++ b/drivers/staging/comedi/proc.c @@ -1,27 +1,26 @@  /* -    module/proc.c -    /proc interface for comedi - -    COMEDI - Linux Control and Measurement Device Interface -    Copyright (C) 1998 David A. Schleef <ds@schleef.org> - -    This program is free software; you can redistribute it and/or modify -    it under the terms of the GNU General Public License as published by -    the Free Software Foundation; either version 2 of the License, or -    (at your option) any later version. - -    This program is distributed in the hope that it will be useful, -    but WITHOUT ANY WARRANTY; without even the implied warranty of -    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the -    GNU General Public License for more details. -*/ + * /proc interface for comedi + * + * COMEDI - Linux Control and Measurement Device Interface + * Copyright (C) 1998 David A. Schleef <ds@schleef.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + * GNU General Public License for more details. + */  /* -	This is some serious bloatware. - -	Taken from Dave A.'s PCL-711 driver, 'cuz I thought it -	was cool. -*/ + * This is some serious bloatware. + * + * Taken from Dave A.'s PCL-711 driver, 'cuz I thought it + * was cool. + */  #include "comedidev.h"  #include "comedi_internal.h" @@ -34,23 +33,24 @@ static int comedi_read(struct seq_file *m, void *v)  	int devices_q = 0;  	struct comedi_driver *driv; -	seq_printf(m, -		     "comedi version " COMEDI_RELEASE "\n" -		     "format string: %s\n", -		     "\"%2d: %-20s %-20s %4d\", i, " -		     "driver_name, board_name, n_subdevices"); +	seq_printf(m, "comedi version " COMEDI_RELEASE "\nformat string: %s\n", +		   "\"%2d: %-20s %-20s %4d\", i, driver_name, board_name, n_subdevices");  	for (i = 0; i < COMEDI_NUM_BOARD_MINORS; i++) { -		struct comedi_device *dev = comedi_dev_from_minor(i); +		struct comedi_device *dev = comedi_dev_get_from_minor(i); +  		if (!dev)  			continue; +		down_read(&dev->attach_lock);  		if (dev->attached) {  			devices_q = 1;  			seq_printf(m, "%2d: %-20s %-20s %4d\n",  				   i, dev->driver->driver_name,  				   dev->board_name, dev->n_subdevices);  		} +		up_read(&dev->attach_lock); +		comedi_dev_put(dev);  	}  	if (!devices_q)  		seq_puts(m, "no devices\n");  | 
