diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-04 10:00:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-04 10:00:01 -0700 |
| commit | cf626b0da78df6669c6b5f51ddd9a70a0702e579 (patch) | |
| tree | 45d29a4cb7574aed7f140814ed22088ded21c291 /include/linux/isdn/capilli.h | |
| parent | 9c50eafc32ddbd166c8a2bbaecd4ad201c452b14 (diff) | |
| parent | 5ef03dbd91855544cd4c7c1910c3ef5226ee87e8 (diff) | |
| download | linux-0-day-cf626b0da78df6669c6b5f51ddd9a70a0702e579.tar.gz linux-0-day-cf626b0da78df6669c6b5f51ddd9a70a0702e579.tar.xz | |
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
...
Diffstat (limited to 'include/linux/isdn/capilli.h')
| -rw-r--r-- | include/linux/isdn/capilli.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/isdn/capilli.h b/include/linux/isdn/capilli.h index 11b57c4858540..d75e1ad729641 100644 --- a/include/linux/isdn/capilli.h +++ b/include/linux/isdn/capilli.h @@ -50,7 +50,7 @@ struct capi_ctr { u16 (*send_message)(struct capi_ctr *, struct sk_buff *skb); char *(*procinfo)(struct capi_ctr *); - const struct file_operations *proc_fops; + int (*proc_show)(struct seq_file *, void *); /* filled in before calling ready callback */ u8 manu[CAPI_MANUFACTURER_LEN]; /* CAPI_GET_MANUFACTURER */ |