r1744 - trunk/batman-adv - commits - lists.open-mesh.org

24 Jul 2010

Author: marek
Date: 2010-07-24 19:52:53 +0200 (Sat, 24 Jul 2010)
New Revision: 1744
Modified:
   trunk/batman-adv/bat_debugfs.c
   trunk/batman-adv/icmp_socket.c
Log:
batman-adv: Remove unnecessary casts of private_data
Signed-off-by: Joe Perches joe@perches.com
Signed-off-by: Greg Kroah-Hartman gregkh@suse.de
Signed-off-by: Sven Eckelmann sven.eckelmann@gmx.de
Modified: trunk/batman-adv/bat_debugfs.c
===================================================================

--- trunk/batman-adv/bat_debugfs.c	2010-07-22 15:32:03 UTC (rev 1743)
+++ trunk/batman-adv/bat_debugfs.c	2010-07-24 17:52:53 UTC (rev 1744)
@@ -107,7 +107,7 @@
 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;
@@ -161,7 +161,7 @@
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);
Modified: trunk/batman-adv/icmp_socket.c
===================================================================
--- trunk/batman-adv/icmp_socket.c	2010-07-22 15:32:03 UTC (rev 1743)
+++ trunk/batman-adv/icmp_socket.c	2010-07-24 17:52:53 UTC (rev 1744)
@@ -80,8 +80,7 @@
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;
@@ -109,8 +108,7 @@
 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;
@@ -157,8 +155,7 @@
 {
    /* 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;
@@ -249,8 +246,7 @@
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);

    