From 4e129b732127d0b2bee813a85cbfe09402771856 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Sat, 4 Sep 2010 18:52:46 -0700
Subject: [PATCH] --- yaml --- r: 216022 b: refs/heads/master c:
 35df83970ecdc2cffb141503cf721a740d0f0ec5 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/scsi/aacraid/linit.c | 2 +-
 trunk/drivers/scsi/sg.c            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 118bed656caa..1129f5155453 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27e49945ac7090b818e44cb9e8ae4b94fd711e41
+refs/heads/master: 35df83970ecdc2cffb141503cf721a740d0f0ec5
diff --git a/trunk/drivers/scsi/aacraid/linit.c b/trunk/drivers/scsi/aacraid/linit.c
index cad6f9abaeb9..aa4003699027 100644
--- a/trunk/drivers/scsi/aacraid/linit.c
+++ b/trunk/drivers/scsi/aacraid/linit.c
@@ -770,7 +770,7 @@ static long aac_compat_cfg_ioctl(struct file *file, unsigned cmd, unsigned long
 {
 	if (!capable(CAP_SYS_RAWIO))
 		return -EPERM;
-	return aac_compat_do_ioctl((struct aac_dev *)file->private_data, cmd, arg);
+	return aac_compat_do_ioctl(file->private_data, cmd, arg);
 }
 #endif
 
diff --git a/trunk/drivers/scsi/sg.c b/trunk/drivers/scsi/sg.c
index 2968c6b83ddb..307aba9f13ab 100644
--- a/trunk/drivers/scsi/sg.c
+++ b/trunk/drivers/scsi/sg.c
@@ -210,7 +210,7 @@ static void sg_put_dev(Sg_device *sdp);
 
 static int sg_allow_access(struct file *filp, unsigned char *cmd)
 {
-	struct sg_fd *sfp = (struct sg_fd *)filp->private_data;
+	struct sg_fd *sfp = filp->private_data;
 
 	if (sfp->parentdp->device->type == TYPE_SCANNER)
 		return 0;