evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[SCSI] megaraid: fix compiler warnings

Browse source 
The user ioctl mailbox can only support a 32 bit address for the
commands structure.  This is fine, since the area it's pointing to is
allocated with pci_alloc_consistent(), so it should be physically <
4GB.  Thus kill the ptr to u32 conversion warnings on 64 bit.

Signed-off-by: Martin J. Bligh <mbligh@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: "Patro, Sumant" <Sumant.Patro@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Martin Bligh 2007-05-23 16:11:46 -07:00 • committed by James Bottomley
parent c6a6c81cfd
commit de5952e91c
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/scsi/megaraid.c
View file

@ -3571,7 +3571,7 @@ megadev_ioctl(struct inode *inode, struct file *filep, unsigned int cmd,
/* /*
* The user passthru structure * The user passthru structure
*/ */
upthru = (mega_passthru __user *)MBOX(uioc)->xferaddr; upthru = (mega_passthru __user *)(unsigned long)MBOX(uioc)->xferaddr;
/* /*
* Copy in the user passthru here. * Copy in the user passthru here.
@ -3623,7 +3623,7 @@ megadev_ioctl(struct inode *inode, struct file *filep, unsigned int cmd,
/* /*
* Get the user data * Get the user data
*/ */
if( copy_from_user(data, (char __user *)uxferaddr, if( copy_from_user(data, (char __user *)(unsigned long) uxferaddr,
pthru->dataxferlen) ) { pthru->dataxferlen) ) {
rval = (-EFAULT); rval = (-EFAULT);
goto freemem_and_return; goto freemem_and_return;
@ -3649,7 +3649,7 @@ megadev_ioctl(struct inode *inode, struct file *filep, unsigned int cmd,
* Is data going up-stream * Is data going up-stream
*/ */
if( pthru->dataxferlen && (uioc.flags & UIOC_RD) ) { if( pthru->dataxferlen && (uioc.flags & UIOC_RD) ) {
if( copy_to_user((char __user *)uxferaddr, data, if( copy_to_user((char __user *)(unsigned long) uxferaddr, data,
pthru->dataxferlen) ) { pthru->dataxferlen) ) {
rval = (-EFAULT); rval = (-EFAULT);
} }
@ -3702,7 +3702,7 @@ freemem_and_return:
/* /*
* Get the user data * Get the user data
*/ */
if( copy_from_user(data, (char __user *)uxferaddr, if( copy_from_user(data, (char __user *)(unsigned long) uxferaddr,
uioc.xferlen) ) { uioc.xferlen) ) {
pci_free_consistent(pdev, pci_free_consistent(pdev,
@ -3742,7 +3742,7 @@ freemem_and_return:
* Is data going up-stream * Is data going up-stream
*/ */
if( uioc.xferlen && (uioc.flags & UIOC_RD) ) { if( uioc.xferlen && (uioc.flags & UIOC_RD) ) {
if( copy_to_user((char __user *)uxferaddr, data, if( copy_to_user((char __user *)(unsigned long) uxferaddr, data,
uioc.xferlen) ) { uioc.xferlen) ) {
rval = (-EFAULT); rval = (-EFAULT);