pcmcia: switch /proc/bus/pccard/drivers to seq_file
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Cc: Dominik Brodowski <linux@dominikbrodowski.net> Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
470967dc6c
commit
e6be4a8c26
|
@ -27,6 +27,7 @@
|
||||||
#include <linux/proc_fs.h>
|
#include <linux/proc_fs.h>
|
||||||
#include <linux/poll.h>
|
#include <linux/poll.h>
|
||||||
#include <linux/pci.h>
|
#include <linux/pci.h>
|
||||||
|
#include <linux/seq_file.h>
|
||||||
#include <linux/smp_lock.h>
|
#include <linux/smp_lock.h>
|
||||||
#include <linux/workqueue.h>
|
#include <linux/workqueue.h>
|
||||||
|
|
||||||
|
@ -105,37 +106,40 @@ static struct pcmcia_driver *get_pcmcia_driver(dev_info_t *dev_info)
|
||||||
#ifdef CONFIG_PROC_FS
|
#ifdef CONFIG_PROC_FS
|
||||||
static struct proc_dir_entry *proc_pccard = NULL;
|
static struct proc_dir_entry *proc_pccard = NULL;
|
||||||
|
|
||||||
static int proc_read_drivers_callback(struct device_driver *driver, void *d)
|
static int proc_read_drivers_callback(struct device_driver *driver, void *_m)
|
||||||
{
|
{
|
||||||
char **p = d;
|
struct seq_file *m = _m;
|
||||||
struct pcmcia_driver *p_drv = container_of(driver,
|
struct pcmcia_driver *p_drv = container_of(driver,
|
||||||
struct pcmcia_driver, drv);
|
struct pcmcia_driver, drv);
|
||||||
|
|
||||||
*p += sprintf(*p, "%-24.24s 1 %d\n", p_drv->drv.name,
|
seq_printf(m, "%-24.24s 1 %d\n", p_drv->drv.name,
|
||||||
#ifdef CONFIG_MODULE_UNLOAD
|
#ifdef CONFIG_MODULE_UNLOAD
|
||||||
(p_drv->owner) ? module_refcount(p_drv->owner) : 1
|
(p_drv->owner) ? module_refcount(p_drv->owner) : 1
|
||||||
#else
|
#else
|
||||||
1
|
1
|
||||||
#endif
|
#endif
|
||||||
);
|
);
|
||||||
d = (void *) p;
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int proc_read_drivers(char *buf, char **start, off_t pos,
|
static int pccard_drivers_proc_show(struct seq_file *m, void *v)
|
||||||
int count, int *eof, void *data)
|
|
||||||
{
|
{
|
||||||
char *p = buf;
|
return bus_for_each_drv(&pcmcia_bus_type, NULL,
|
||||||
int rc;
|
m, proc_read_drivers_callback);
|
||||||
|
|
||||||
rc = bus_for_each_drv(&pcmcia_bus_type, NULL,
|
|
||||||
(void *) &p, proc_read_drivers_callback);
|
|
||||||
if (rc < 0)
|
|
||||||
return rc;
|
|
||||||
|
|
||||||
return (p - buf);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int pccard_drivers_proc_open(struct inode *inode, struct file *file)
|
||||||
|
{
|
||||||
|
return single_open(file, pccard_drivers_proc_show, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
static const struct file_operations pccard_drivers_proc_fops = {
|
||||||
|
.owner = THIS_MODULE,
|
||||||
|
.open = pccard_drivers_proc_open,
|
||||||
|
.read = seq_read,
|
||||||
|
.llseek = seq_lseek,
|
||||||
|
.release = single_release,
|
||||||
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -1011,7 +1015,7 @@ void __init pcmcia_setup_ioctl(void) {
|
||||||
#ifdef CONFIG_PROC_FS
|
#ifdef CONFIG_PROC_FS
|
||||||
proc_pccard = proc_mkdir("bus/pccard", NULL);
|
proc_pccard = proc_mkdir("bus/pccard", NULL);
|
||||||
if (proc_pccard)
|
if (proc_pccard)
|
||||||
create_proc_read_entry("drivers",0,proc_pccard,proc_read_drivers,NULL);
|
proc_create("drivers", 0, proc_pccard, &pccard_drivers_proc_fops);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue