Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0572325 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13946): proc_fops: convert av7110 



Drop S_IRUGO, proc entry doesn't contain read hooks.
Drop S_IFREG, simply unnecessary.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 9c6f97a0

drivers/media/dvb/ttpci/av7110_ir.c

+8 −6
Original line number Diff line number Diff line
@@ -268,8 +268,8 @@ int av7110_check_ir_config(struct av7110 *av7110, int force) 




/* /proc/av7110_ir interface */

static int av7110_ir_write_proc(struct file *file, const char __user *buffer,

				unsigned long count, void *data)

static ssize_t av7110_ir_proc_write(struct file *file, const char __user *buffer,

				    size_t count, loff_t *pos)

{

	char *page;

	u32 ir_config;
@@ -309,6 +309,10 @@ static int av7110_ir_write_proc(struct file *file, const char __user *buffer, 
	return count;

}



static const struct file_operations av7110_ir_proc_fops = {

	.owner		= THIS_MODULE,

	.write		= av7110_ir_proc_write,

};



/* interrupt handler */

static void ir_handler(struct av7110 *av7110, u32 ircom)
@@ -368,12 +372,10 @@ int __devinit av7110_ir_init(struct av7110 *av7110) 
	input_dev->timer.data = (unsigned long) &av7110->ir;



	if (av_cnt == 1) {

		e = create_proc_entry("av7110_ir", S_IFREG | S_IRUGO | S_IWUSR, NULL);

		if (e) {

			e->write_proc = av7110_ir_write_proc;

		e = proc_create("av7110_ir", S_IWUSR, NULL, &av7110_ir_proc_fops);

		if (e)

			e->size = 4 + 256 * sizeof(u16);

	}

	}



	tasklet_init(&av7110->ir.ir_tasklet, av7110_emit_key, (unsigned long) &av7110->ir);

	av7110->ir.ir_handler = ir_handler;