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

Commit e0ac7da0 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

staging: lirc: Remove unnecessary casts of private_data 



Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 430eb1ba

drivers/staging/lirc/lirc_imon.c

+2 −2
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static int display_close(struct inode *inode, struct file *file) 
	struct imon_context *context = NULL;

	int retval = 0;



	context = (struct imon_context *)file->private_data;

	context = file->private_data;



	if (!context) {

		err("%s: no context for device", __func__);
@@ -380,7 +380,7 @@ static ssize_t vfd_write(struct file *file, const char *buf, 
		0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF };

	int *data_buf;



	context = (struct imon_context *)file->private_data;

	context = file->private_data;

	if (!context) {

		err("%s: no context for device", __func__);

		return -ENODEV;

drivers/staging/lirc/lirc_zilog.c

+5 −5
Original line number Diff line number Diff line
@@ -716,7 +716,7 @@ static loff_t lseek(struct file *filep, loff_t offset, int orig) 
/* copied from lirc_dev */

static ssize_t read(struct file *filep, char *outbuf, size_t n, loff_t *ppos)

{

	struct IR *ir = (struct IR *)filep->private_data;

	struct IR *ir = filep->private_data;

	unsigned char buf[ir->buf.chunk_size];

	int ret = 0, written = 0;

	DECLARE_WAITQUEUE(wait, current);
@@ -898,7 +898,7 @@ done: 
static ssize_t write(struct file *filep, const char *buf, size_t n,

			  loff_t *ppos)

{

	struct IR *ir = (struct IR *)filep->private_data;

	struct IR *ir = filep->private_data;

	size_t i;

	int failures = 0;
@@ -972,7 +972,7 @@ static ssize_t write(struct file *filep, const char *buf, size_t n, 
/* copied from lirc_dev */

static unsigned int poll(struct file *filep, poll_table *wait)

{

	struct IR *ir = (struct IR *)filep->private_data;

	struct IR *ir = filep->private_data;

	unsigned int ret;



	dprintk("poll called\n");
@@ -994,7 +994,7 @@ static unsigned int poll(struct file *filep, poll_table *wait) 


static long ioctl(struct file *filep, unsigned int cmd, unsigned long arg)

{

	struct IR *ir = (struct IR *)filep->private_data;

	struct IR *ir = filep->private_data;

	int result;

	unsigned long mode, features = 0;
@@ -1086,7 +1086,7 @@ static int open(struct inode *node, struct file *filep) 
static int close(struct inode *node, struct file *filep)

{

	/* find our IR struct */

	struct IR *ir = (struct IR *)filep->private_data;

	struct IR *ir = filep->private_data;

	if (ir == NULL) {

		zilog_error("close: no private_data attached to the file!\n");

		return -ENODEV;