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
@@ -89,13 +89,12 @@ static ssize_t pvc_line_proc_write(struct file *file, const char __user *buf,
|
||||
return count;
|
||||
}
|
||||
|
||||
static const struct file_operations pvc_line_proc_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = pvc_line_proc_open,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = single_release,
|
||||
.write = pvc_line_proc_write,
|
||||
static const struct proc_ops pvc_line_proc_ops = {
|
||||
.proc_open = pvc_line_proc_open,
|
||||
.proc_read = seq_read,
|
||||
.proc_lseek = seq_lseek,
|
||||
.proc_release = single_release,
|
||||
.proc_write = pvc_line_proc_write,
|
||||
};
|
||||
|
||||
static ssize_t pvc_scroll_proc_write(struct file *file, const char __user *buf,
|
||||
@@ -148,13 +147,12 @@ static int pvc_scroll_proc_open(struct inode *inode, struct file *file)
|
||||
return single_open(file, pvc_scroll_proc_show, NULL);
|
||||
}
|
||||
|
||||
static const struct file_operations pvc_scroll_proc_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = pvc_scroll_proc_open,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = single_release,
|
||||
.write = pvc_scroll_proc_write,
|
||||
static const struct proc_ops pvc_scroll_proc_ops = {
|
||||
.proc_open = pvc_scroll_proc_open,
|
||||
.proc_read = seq_read,
|
||||
.proc_lseek = seq_lseek,
|
||||
.proc_release = single_release,
|
||||
.proc_write = pvc_scroll_proc_write,
|
||||
};
|
||||
|
||||
void pvc_proc_timerfunc(struct timer_list *unused)
|
||||
@@ -189,12 +187,11 @@ static int __init pvc_proc_init(void)
|
||||
}
|
||||
for (i = 0; i < PVC_NLINES; i++) {
|
||||
proc_entry = proc_create_data(pvc_linename[i], 0644, dir,
|
||||
&pvc_line_proc_fops, &pvc_linedata[i]);
|
||||
&pvc_line_proc_ops, &pvc_linedata[i]);
|
||||
if (proc_entry == NULL)
|
||||
goto error;
|
||||
}
|
||||
proc_entry = proc_create("scroll", 0644, dir,
|
||||
&pvc_scroll_proc_fops);
|
||||
proc_entry = proc_create("scroll", 0644, dir, &pvc_scroll_proc_ops);
|
||||
if (proc_entry == NULL)
|
||||
goto error;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user