proc: convert everything to "struct proc_ops"
The most notable change is DEFINE_SHOW_ATTRIBUTE macro split in seq_file.h. Conversion rule is: llseek => proc_lseek unlocked_ioctl => proc_ioctl xxx => proc_xxx delete ".owner = THIS_MODULE" line [akpm@linux-foundation.org: fix drivers/isdn/capi/kcapi_proc.c] [sfr@canb.auug.org.au: fix kernel/sched/psi.c] Link: http://lkml.kernel.org/r/20200122180545.36222f50@canb.auug.org.au Link: http://lkml.kernel.org/r/20191225172546.GB13378@avx2 Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
d56c0d45f0
commit
97a32539b9
@@ -53,15 +53,12 @@ static ssize_t proc_mpc_write(struct file *file, const char __user *buff,
|
||||
|
||||
static int parse_qos(const char *buff);
|
||||
|
||||
/*
|
||||
* Define allowed FILE OPERATIONS
|
||||
*/
|
||||
static const struct file_operations mpc_file_operations = {
|
||||
.open = proc_mpc_open,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.write = proc_mpc_write,
|
||||
.release = seq_release,
|
||||
static const struct proc_ops mpc_proc_ops = {
|
||||
.proc_open = proc_mpc_open,
|
||||
.proc_read = seq_read,
|
||||
.proc_lseek = seq_lseek,
|
||||
.proc_write = proc_mpc_write,
|
||||
.proc_release = seq_release,
|
||||
};
|
||||
|
||||
/*
|
||||
@@ -290,7 +287,7 @@ int mpc_proc_init(void)
|
||||
{
|
||||
struct proc_dir_entry *p;
|
||||
|
||||
p = proc_create(STAT_FILE_NAME, 0, atm_proc_root, &mpc_file_operations);
|
||||
p = proc_create(STAT_FILE_NAME, 0, atm_proc_root, &mpc_proc_ops);
|
||||
if (!p) {
|
||||
pr_err("Unable to initialize /proc/atm/%s\n", STAT_FILE_NAME);
|
||||
return -ENOMEM;
|
||||
|
||||
@@ -36,9 +36,9 @@
|
||||
static ssize_t proc_dev_atm_read(struct file *file, char __user *buf,
|
||||
size_t count, loff_t *pos);
|
||||
|
||||
static const struct file_operations proc_atm_dev_ops = {
|
||||
.read = proc_dev_atm_read,
|
||||
.llseek = noop_llseek,
|
||||
static const struct proc_ops atm_dev_proc_ops = {
|
||||
.proc_read = proc_dev_atm_read,
|
||||
.proc_lseek = noop_llseek,
|
||||
};
|
||||
|
||||
static void add_stats(struct seq_file *seq, const char *aal,
|
||||
@@ -359,7 +359,7 @@ int atm_proc_dev_register(struct atm_dev *dev)
|
||||
goto err_out;
|
||||
|
||||
dev->proc_entry = proc_create_data(dev->proc_name, 0, atm_proc_root,
|
||||
&proc_atm_dev_ops, dev);
|
||||
&atm_dev_proc_ops, dev);
|
||||
if (!dev->proc_entry)
|
||||
goto err_free_name;
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user