Fix up compiler warnings in megaraid driver
Subsystems (2)
PATCH 1/1 Fix up compiler warnings in megaraid driver
Fix up compiler warnings in megaraid driver
Signed-off-by Martin J. Bligh <[email protected]>
drivers/scsi/megaraid.c +13 -9
@@ -73,10 +73,14 @@ static unsigned short int max_mbox_busy_module_param (max_mbox_busy_wait, ushort,0 );MODULE_PARM_DESC (max_mbox_busy_wait,"Maximum wait for mailbox in microseconds if busy (default=MBOX_BUSY_WAIT=10)" ); -#define RDINDOOR (adapter) readl((adapter)->base + 0x20) -#define RDOUTDOOR (adapter) readl((adapter)->base + 0x2C) -#define WRINDOOR (adapter,value) writel(value, (adapter)->base + 0x20) -#define WROUTDOOR (adapter,value) writel(value, (adapter)->base + 0x2C) +#define RDINDOOR (adapter) readl((volatile void __iomem *) \ + (adapter)->base + 0x20) +#define RDOUTDOOR (adapter) readl((volatile void __iomem *) \ + (adapter)->base + 0x2C) +#define WRINDOOR (adapter,value) writel(value, (volatile void __iomem *)\ + (adapter)->base + 0x20) +#define WROUTDOOR (adapter,value) writel(value, (volatile void __iomem *)\ + (adapter)->base + 0x2C)/* * Global variables
@@ -3566,7 +3570,7 @@ megadev_ioctl(struct inode *inode, struc/* * 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.
@@ -3618,7 +3622,7 @@ megadev_ioctl(struct inode *inode, struc/* * Get the user data */ -if (copy_from_user (data, (char __user *)uxferaddr, +if (copy_from_user (data, (char __user *)(unsigned long ) uxferaddr, pthru->dataxferlen) ) { rval = (-EFAULT ); goto freemem_and_return;
@@ -3644,7 +3648,7 @@ megadev_ioctl(struct inode *inode, struc* Is data going up-stream */ 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) ) { rval = (-EFAULT ); }
@@ -3697,7 +3701,7 @@ freemem_and_return:/* * Get the user data */ -if (copy_from_user (data, (char __user *)uxferaddr, +if (copy_from_user (data, (char __user *)(unsigned long ) uxferaddr, uioc.xferlen) ) { pci_free_consistent(pdev,
@@ -3737,7 +3741,7 @@ freemem_and_return:* Is data going up-stream */ 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) ) { rval = (-EFAULT );
Quoted 19 lines · Martin Bligh
Fix up compiler warnings in megaraid driver
Signed-off-by Martin J. Bligh <[email protected]>------------------------------------------------------------------------
diff -aurpN -X
/home/mbligh/.diff.excludelinux-2.6.19/drivers/scsi/megaraid.c2.6.19-megaraid/drivers/scsi/megaraid.cdrivers/scsi/megaraid.c +1
-4@@ -73,10 +73,14 @@ static unsigned short int max_mbox_busy_module_param (max_mbox_busy_wait, ushort,0 );MODULE_PARM_DESC (max_mbox_busy_wait,"Maximum wait for mailbox in microseconds if busy (default=MBOX_BUSY_WAIT=10)" ); -#define RDINDOOR (adapter) readl((adapter)->base + 0x20) -#define RDOUTDOOR (adapter) readl((adapter)->base + 0x2C) -#define WRINDOOR (adapter,value) writel(value, (adapter)->base + 0x20) -#define WROUTDOOR (adapter,value) writel(value, (adapter)->base + 0x2C) +#define RDINDOOR (adapter) readl((volatile void __iomem *) \
drivers/scsi/megaraid.c static unsigned short int max_mbox_busy_ · line 86
Quoted 10 lines
drivers/scsi/megaraid.c +7
-0+ (adapter)->base + 0x20) +#define RDOUTDOOR (adapter) readl((volatile void __iomem *) \ + (adapter)->base + 0x2C) +#define WRINDOOR (adapter,value) writel(value, (volatile void __iomem *)\ + (adapter)->base + 0x20) +#define WROUTDOOR (adapter,value) writel(value, (volatile void __iomem *)\ + (adapter)->base + 0x2C)/* * Global variables
I posted a better fix just yesterday...
Jeff