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

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

Staging: 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 f69b0d64

drivers/staging/batman-adv/bat_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static int log_release(struct inode *inode, struct file *file) 
static ssize_t log_read(struct file *file, char __user *buf,

			size_t count, loff_t *ppos)

{

	struct bat_priv *bat_priv = (struct bat_priv *)file->private_data;

	struct bat_priv *bat_priv = file->private_data;

	struct debug_log *debug_log = bat_priv->debug_log;

	int error, i = 0;

	char c;
@@ -158,7 +158,7 @@ static ssize_t log_read(struct file *file, char __user *buf, 


static unsigned int log_poll(struct file *file, poll_table *wait)

{

	struct bat_priv *bat_priv = (struct bat_priv *)file->private_data;

	struct bat_priv *bat_priv = file->private_data;

	struct debug_log *debug_log = bat_priv->debug_log;



	poll_wait(file, &debug_log->queue_wait, wait);

drivers/staging/batman-adv/icmp_socket.c

+4 −8
Original line number Diff line number Diff line
@@ -78,8 +78,7 @@ static int bat_socket_open(struct inode *inode, struct file *file) 


static int bat_socket_release(struct inode *inode, struct file *file)

{

	struct socket_client *socket_client =

		(struct socket_client *)file->private_data;

	struct socket_client *socket_client = file->private_data;

	struct socket_packet *socket_packet;

	struct list_head *list_pos, *list_pos_tmp;

	unsigned long flags;
@@ -107,8 +106,7 @@ static int bat_socket_release(struct inode *inode, struct file *file) 
static ssize_t bat_socket_read(struct file *file, char __user *buf,

			       size_t count, loff_t *ppos)

{

	struct socket_client *socket_client =

		(struct socket_client *)file->private_data;

	struct socket_client *socket_client = file->private_data;

	struct socket_packet *socket_packet;

	size_t packet_len;

	int error;
@@ -155,8 +153,7 @@ static ssize_t bat_socket_write(struct file *file, const char __user *buff, 
{

	/* FIXME: each orig_node->batman_if will be attached to a softif */

	struct bat_priv *bat_priv = netdev_priv(soft_device);

	struct socket_client *socket_client =

		(struct socket_client *)file->private_data;

	struct socket_client *socket_client = file->private_data;

	struct icmp_packet_rr icmp_packet;

	struct orig_node *orig_node;

	struct batman_if *batman_if;
@@ -247,8 +244,7 @@ out: 


static unsigned int bat_socket_poll(struct file *file, poll_table *wait)

{

	struct socket_client *socket_client =

		(struct socket_client *)file->private_data;

	struct socket_client *socket_client = file->private_data;



	poll_wait(file, &socket_client->queue_wait, wait);

drivers/staging/cx25821/cx25821-alsa.c

+1 −1
Original line number Diff line number Diff line
@@ -699,7 +699,7 @@ static int cx25821_audio_initdev(struct cx25821_dev *dev) 


	/* Card "creation" */

	card->private_free = snd_cx25821_dev_free;

	chip = (struct cx25821_audio_dev *) card->private_data;

	chip = card->private_data;

	spin_lock_init(&chip->reg_lock);



	chip->dev = dev;

drivers/staging/easycap/easycap_ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ static struct easycap *peasycap; 
static struct usb_device *p;

static __u32 isequence;



peasycap = (struct easycap *)file->private_data;

peasycap = file->private_data;

if (NULL == peasycap) {

	SAY("ERROR:  peasycap is NULL\n");

	return -1;
@@ -1973,7 +1973,7 @@ int easysnd_ioctl(struct inode *inode, struct file *file, \ 
struct easycap *peasycap;

struct usb_device *p;



peasycap = (struct easycap *)file->private_data;

peasycap = file->private_data;

if (NULL == peasycap) {

	SAY("ERROR:  peasycap is NULL.\n");

	return -1;

drivers/staging/easycap/easycap_main.c

+2 −2
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ struct easycap *peasycap; 


JOT(4, "\n");



peasycap = (struct easycap *)file->private_data;

peasycap = file->private_data;

if (NULL == peasycap) {

	SAY("ERROR:  peasycap is NULL.\n");

	SAY("ending unsuccessfully\n");
@@ -819,7 +819,7 @@ if (NULL == ((struct file *)file)) { 
	SAY("ERROR:  file pointer is NULL\n");

	return -EFAULT;

}

peasycap = (struct easycap *)file->private_data;

peasycap = file->private_data;

if (NULL == peasycap) {

	SAY("ERROR:  peasycap is NULL\n");

	return -EFAULT;