From 822068ceb77b767233a2cad9651abda79980c3aa Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Mon, 12 Jul 2010 10:50:02 +0000
Subject: [PATCH] --- yaml --- r: 203484 b: refs/heads/master c:
 54cbb1cab88ef20c284eef8c24a6d86fad989464 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/isdn/capi/capi.c           | 6 +++---
 trunk/drivers/isdn/hysdn/hysdn_proclog.c | 2 +-
 trunk/drivers/isdn/i4l/isdn_ppp.c        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 60f4c2cbcc7e..024f1104717f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06df277a670263a073362046855851aad278d988
+refs/heads/master: 54cbb1cab88ef20c284eef8c24a6d86fad989464
diff --git a/trunk/drivers/isdn/capi/capi.c b/trunk/drivers/isdn/capi/capi.c
index b0a4a691cbaa..f80a7c48a35f 100644
--- a/trunk/drivers/isdn/capi/capi.c
+++ b/trunk/drivers/isdn/capi/capi.c
@@ -691,7 +691,7 @@ static void capi_recv_message(struct capi20_appl *ap, struct sk_buff *skb)
 static ssize_t
 capi_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
 {
-	struct capidev *cdev = (struct capidev *)file->private_data;
+	struct capidev *cdev = file->private_data;
 	struct sk_buff *skb;
 	size_t copied;
 	int err;
@@ -726,7 +726,7 @@ capi_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
 static ssize_t
 capi_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
 {
-	struct capidev *cdev = (struct capidev *)file->private_data;
+	struct capidev *cdev = file->private_data;
 	struct sk_buff *skb;
 	u16 mlen;
 
@@ -773,7 +773,7 @@ capi_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos
 static unsigned int
 capi_poll(struct file *file, poll_table * wait)
 {
-	struct capidev *cdev = (struct capidev *)file->private_data;
+	struct capidev *cdev = file->private_data;
 	unsigned int mask = 0;
 
 	if (!cdev->ap.applid)
diff --git a/trunk/drivers/isdn/hysdn/hysdn_proclog.c b/trunk/drivers/isdn/hysdn/hysdn_proclog.c
index 37a9dd337308..7003698e667d 100644
--- a/trunk/drivers/isdn/hysdn/hysdn_proclog.c
+++ b/trunk/drivers/isdn/hysdn/hysdn_proclog.c
@@ -158,7 +158,7 @@ hysdn_log_write(struct file *file, const char __user *buf, size_t count, loff_t
 	int found = 0;
 	unsigned char *cp, valbuf[128];
 	long base = 10;
-	hysdn_card *card = (hysdn_card *) file->private_data;
+	hysdn_card *card = file->private_data;
 
 	if (count > (sizeof(valbuf) - 1))
 		count = sizeof(valbuf) - 1;	/* limit length */
diff --git a/trunk/drivers/isdn/i4l/isdn_ppp.c b/trunk/drivers/isdn/i4l/isdn_ppp.c
index 8c46baee621b..fe824e0cbb25 100644
--- a/trunk/drivers/isdn/i4l/isdn_ppp.c
+++ b/trunk/drivers/isdn/i4l/isdn_ppp.c
@@ -477,7 +477,7 @@ isdn_ppp_ioctl(int min, struct file *file, unsigned int cmd, unsigned long arg)
 	struct isdn_ppp_comp_data data;
 	void __user *argp = (void __user *)arg;
 
-	is = (struct ippp_struct *) file->private_data;
+	is = file->private_data;
 	lp = is->lp;
 
 	if (is->debug & 0x1)