fs/proc: replace "__auto_type" with "const auto"
Replace use of "__auto_type" in fs/proc/inode.c with "const auto". Suggested-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com> Reviewed-by: Alexey Dobriyan <adobriyan@gmail.com>pull/1354/merge
parent
b3b8767c29
commit
75beb7effa
|
|
@ -303,7 +303,7 @@ static ssize_t proc_reg_read_iter(struct kiocb *iocb, struct iov_iter *iter)
|
||||||
|
|
||||||
static ssize_t pde_read(struct proc_dir_entry *pde, struct file *file, char __user *buf, size_t count, loff_t *ppos)
|
static ssize_t pde_read(struct proc_dir_entry *pde, struct file *file, char __user *buf, size_t count, loff_t *ppos)
|
||||||
{
|
{
|
||||||
__auto_type read = pde->proc_ops->proc_read;
|
const auto read = pde->proc_ops->proc_read;
|
||||||
if (read)
|
if (read)
|
||||||
return read(file, buf, count, ppos);
|
return read(file, buf, count, ppos);
|
||||||
return -EIO;
|
return -EIO;
|
||||||
|
|
@ -325,7 +325,7 @@ static ssize_t proc_reg_read(struct file *file, char __user *buf, size_t count,
|
||||||
|
|
||||||
static ssize_t pde_write(struct proc_dir_entry *pde, struct file *file, const char __user *buf, size_t count, loff_t *ppos)
|
static ssize_t pde_write(struct proc_dir_entry *pde, struct file *file, const char __user *buf, size_t count, loff_t *ppos)
|
||||||
{
|
{
|
||||||
__auto_type write = pde->proc_ops->proc_write;
|
const auto write = pde->proc_ops->proc_write;
|
||||||
if (write)
|
if (write)
|
||||||
return write(file, buf, count, ppos);
|
return write(file, buf, count, ppos);
|
||||||
return -EIO;
|
return -EIO;
|
||||||
|
|
@ -347,7 +347,7 @@ static ssize_t proc_reg_write(struct file *file, const char __user *buf, size_t
|
||||||
|
|
||||||
static __poll_t pde_poll(struct proc_dir_entry *pde, struct file *file, struct poll_table_struct *pts)
|
static __poll_t pde_poll(struct proc_dir_entry *pde, struct file *file, struct poll_table_struct *pts)
|
||||||
{
|
{
|
||||||
__auto_type poll = pde->proc_ops->proc_poll;
|
const auto poll = pde->proc_ops->proc_poll;
|
||||||
if (poll)
|
if (poll)
|
||||||
return poll(file, pts);
|
return poll(file, pts);
|
||||||
return DEFAULT_POLLMASK;
|
return DEFAULT_POLLMASK;
|
||||||
|
|
@ -369,7 +369,7 @@ static __poll_t proc_reg_poll(struct file *file, struct poll_table_struct *pts)
|
||||||
|
|
||||||
static long pde_ioctl(struct proc_dir_entry *pde, struct file *file, unsigned int cmd, unsigned long arg)
|
static long pde_ioctl(struct proc_dir_entry *pde, struct file *file, unsigned int cmd, unsigned long arg)
|
||||||
{
|
{
|
||||||
__auto_type ioctl = pde->proc_ops->proc_ioctl;
|
const auto ioctl = pde->proc_ops->proc_ioctl;
|
||||||
if (ioctl)
|
if (ioctl)
|
||||||
return ioctl(file, cmd, arg);
|
return ioctl(file, cmd, arg);
|
||||||
return -ENOTTY;
|
return -ENOTTY;
|
||||||
|
|
@ -392,7 +392,7 @@ static long proc_reg_unlocked_ioctl(struct file *file, unsigned int cmd, unsigne
|
||||||
#ifdef CONFIG_COMPAT
|
#ifdef CONFIG_COMPAT
|
||||||
static long pde_compat_ioctl(struct proc_dir_entry *pde, struct file *file, unsigned int cmd, unsigned long arg)
|
static long pde_compat_ioctl(struct proc_dir_entry *pde, struct file *file, unsigned int cmd, unsigned long arg)
|
||||||
{
|
{
|
||||||
__auto_type compat_ioctl = pde->proc_ops->proc_compat_ioctl;
|
const auto compat_ioctl = pde->proc_ops->proc_compat_ioctl;
|
||||||
if (compat_ioctl)
|
if (compat_ioctl)
|
||||||
return compat_ioctl(file, cmd, arg);
|
return compat_ioctl(file, cmd, arg);
|
||||||
return -ENOTTY;
|
return -ENOTTY;
|
||||||
|
|
@ -414,7 +414,7 @@ static long proc_reg_compat_ioctl(struct file *file, unsigned int cmd, unsigned
|
||||||
|
|
||||||
static int pde_mmap(struct proc_dir_entry *pde, struct file *file, struct vm_area_struct *vma)
|
static int pde_mmap(struct proc_dir_entry *pde, struct file *file, struct vm_area_struct *vma)
|
||||||
{
|
{
|
||||||
__auto_type mmap = pde->proc_ops->proc_mmap;
|
const auto mmap = pde->proc_ops->proc_mmap;
|
||||||
if (mmap)
|
if (mmap)
|
||||||
return mmap(file, vma);
|
return mmap(file, vma);
|
||||||
return -EIO;
|
return -EIO;
|
||||||
|
|
@ -497,7 +497,7 @@ static int proc_reg_open(struct inode *inode, struct file *file)
|
||||||
if (!use_pde(pde))
|
if (!use_pde(pde))
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
|
|
||||||
__auto_type release = pde->proc_ops->proc_release;
|
const auto release = pde->proc_ops->proc_release;
|
||||||
if (release) {
|
if (release) {
|
||||||
pdeo = kmem_cache_alloc(pde_opener_cache, GFP_KERNEL);
|
pdeo = kmem_cache_alloc(pde_opener_cache, GFP_KERNEL);
|
||||||
if (!pdeo) {
|
if (!pdeo) {
|
||||||
|
|
@ -534,10 +534,9 @@ static int proc_reg_release(struct inode *inode, struct file *file)
|
||||||
struct pde_opener *pdeo;
|
struct pde_opener *pdeo;
|
||||||
|
|
||||||
if (pde_is_permanent(pde)) {
|
if (pde_is_permanent(pde)) {
|
||||||
__auto_type release = pde->proc_ops->proc_release;
|
const auto release = pde->proc_ops->proc_release;
|
||||||
if (release) {
|
if (release)
|
||||||
return release(inode, file);
|
return release(inode, file);
|
||||||
}
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue