mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge branch 'hch.procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull procfs updates from Al Viro:
"Christoph's proc_create_... cleanups series"
* 'hch.procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (44 commits)
xfs, proc: hide unused xfs procfs helpers
isdn/gigaset: add back gigaset_procinfo assignment
proc: update SIZEOF_PDE_INLINE_NAME for the new pde fields
tty: replace ->proc_fops with ->proc_show
ide: replace ->proc_fops with ->proc_show
ide: remove ide_driver_proc_write
isdn: replace ->proc_fops with ->proc_show
atm: switch to proc_create_seq_private
atm: simplify procfs code
bluetooth: switch to proc_create_seq_data
netfilter/x_tables: switch to proc_create_seq_private
netfilter/xt_hashlimit: switch to proc_create_{seq,single}_data
neigh: switch to proc_create_seq_data
hostap: switch to proc_create_{seq,single}_data
bonding: switch to proc_create_seq_data
rtc/proc: switch to proc_create_single_data
drbd: switch to proc_create_single
resource: switch to proc_create_seq_data
staging/rtl8192u: simplify procfs code
jfs: simplify procfs code
...
This commit is contained in:
commit
cf626b0da7
266 changed files with 1229 additions and 6032 deletions
|
|
@ -1108,19 +1108,6 @@ static int ccio_proc_info(struct seq_file *m, void *p)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int ccio_proc_info_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
return single_open(file, &ccio_proc_info, NULL);
|
||||
}
|
||||
|
||||
static const struct file_operations ccio_proc_info_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = ccio_proc_info_open,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = single_release,
|
||||
};
|
||||
|
||||
static int ccio_proc_bitmap_info(struct seq_file *m, void *p)
|
||||
{
|
||||
struct ioc *ioc = ioc_list;
|
||||
|
|
@ -1135,19 +1122,6 @@ static int ccio_proc_bitmap_info(struct seq_file *m, void *p)
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int ccio_proc_bitmap_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
return single_open(file, &ccio_proc_bitmap_info, NULL);
|
||||
}
|
||||
|
||||
static const struct file_operations ccio_proc_bitmap_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = ccio_proc_bitmap_open,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = single_release,
|
||||
};
|
||||
#endif /* CONFIG_PROC_FS */
|
||||
|
||||
/**
|
||||
|
|
@ -1589,10 +1563,10 @@ static int __init ccio_probe(struct parisc_device *dev)
|
|||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
if (ioc_count == 0) {
|
||||
proc_create(MODULE_NAME, 0, proc_runway_root,
|
||||
&ccio_proc_info_fops);
|
||||
proc_create(MODULE_NAME"-bitmap", 0, proc_runway_root,
|
||||
&ccio_proc_bitmap_fops);
|
||||
proc_create_single(MODULE_NAME, 0, proc_runway_root,
|
||||
ccio_proc_info);
|
||||
proc_create_single(MODULE_NAME"-bitmap", 0, proc_runway_root,
|
||||
ccio_proc_bitmap_info);
|
||||
}
|
||||
#endif
|
||||
ioc_count++;
|
||||
|
|
|
|||
|
|
@ -1863,20 +1863,6 @@ static int sba_proc_info(struct seq_file *m, void *p)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
sba_proc_open(struct inode *i, struct file *f)
|
||||
{
|
||||
return single_open(f, &sba_proc_info, NULL);
|
||||
}
|
||||
|
||||
static const struct file_operations sba_proc_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = sba_proc_open,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = single_release,
|
||||
};
|
||||
|
||||
static int
|
||||
sba_proc_bitmap_info(struct seq_file *m, void *p)
|
||||
{
|
||||
|
|
@ -1889,20 +1875,6 @@ sba_proc_bitmap_info(struct seq_file *m, void *p)
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
sba_proc_bitmap_open(struct inode *i, struct file *f)
|
||||
{
|
||||
return single_open(f, &sba_proc_bitmap_info, NULL);
|
||||
}
|
||||
|
||||
static const struct file_operations sba_proc_bitmap_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = sba_proc_bitmap_open,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = single_release,
|
||||
};
|
||||
#endif /* CONFIG_PROC_FS */
|
||||
|
||||
static const struct parisc_device_id sba_tbl[] __initconst = {
|
||||
|
|
@ -2014,8 +1986,8 @@ static int __init sba_driver_callback(struct parisc_device *dev)
|
|||
break;
|
||||
}
|
||||
|
||||
proc_create("sba_iommu", 0, root, &sba_proc_fops);
|
||||
proc_create("sba_iommu-bitmap", 0, root, &sba_proc_bitmap_fops);
|
||||
proc_create_single("sba_iommu", 0, root, sba_proc_info);
|
||||
proc_create_single("sba_iommu-bitmap", 0, root, sba_proc_bitmap_info);
|
||||
#endif
|
||||
|
||||
parisc_has_iommu();
|
||||
|
|
|
|||
Loading…
Reference in a new issue