mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -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
|
|
@ -1829,18 +1829,6 @@ static int mtd_proc_show(struct seq_file *m, void *v)
|
|||
mutex_unlock(&mtd_table_mutex);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int mtd_proc_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
return single_open(file, mtd_proc_show, NULL);
|
||||
}
|
||||
|
||||
static const struct file_operations mtd_proc_ops = {
|
||||
.open = mtd_proc_open,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = single_release,
|
||||
};
|
||||
#endif /* CONFIG_PROC_FS */
|
||||
|
||||
/*====================================================================*/
|
||||
|
|
@ -1883,7 +1871,7 @@ static int __init init_mtd(void)
|
|||
goto err_bdi;
|
||||
}
|
||||
|
||||
proc_mtd = proc_create("mtd", 0, NULL, &mtd_proc_ops);
|
||||
proc_mtd = proc_create_single("mtd", 0, NULL, mtd_proc_show);
|
||||
|
||||
ret = init_mtdchar();
|
||||
if (ret)
|
||||
|
|
|
|||
Loading…
Reference in a new issue