aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/bcm/Bcmnet.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2010-09-30 10:24:11 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-05 08:50:15 -0700
commit9f1c75ac2dba752ad3734bd3ffab805a6a3fbeda (patch)
tree1cc63c6eaf589234d9dfed67163320e263df5e63 /drivers/staging/bcm/Bcmnet.c
parentstaging/ft1000-usb: fix problems found by sparse (diff)
downloadlinux-dev-9f1c75ac2dba752ad3734bd3ffab805a6a3fbeda.tar.xz
linux-dev-9f1c75ac2dba752ad3734bd3ffab805a6a3fbeda.zip
staging/bcm: fix most build warnings
This removes all warnings I get on a 64 bit build except for those that look unfixable, where we convert a pointer to a 32 bit integer and change its byte order! Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/bcm/Bcmnet.c')
-rw-r--r--drivers/staging/bcm/Bcmnet.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/bcm/Bcmnet.c b/drivers/staging/bcm/Bcmnet.c
index d4f4800ca5dd..c619f9118ad2 100644
--- a/drivers/staging/bcm/Bcmnet.c
+++ b/drivers/staging/bcm/Bcmnet.c
@@ -126,7 +126,7 @@ int register_networkdev(PMINI_ADAPTER Adapter)
{
int result=0;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
- int *temp = NULL ;
+ void **temp = NULL; /* actually we're *allocating* the device in alloc_etherdev */
#endif
Adapter->dev = alloc_etherdev(sizeof(PMINI_ADAPTER));
if(!Adapter->dev)
@@ -139,7 +139,7 @@ int register_networkdev(PMINI_ADAPTER Adapter)
Adapter->dev->priv = Adapter;
#else
temp = netdev_priv(Adapter->dev);
- *temp = (UINT)Adapter;
+ *temp = (void *)Adapter;
#endif
//BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "init adapterptr: %x %x\n", (UINT)Adapter, temp);