diff options
| author | Andrew Morton <akpm@osdl.org> | 2007-01-27 00:00:04 -0800 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-01-30 09:36:01 -0500 |
| commit | 9e8e83d1ba0b248de34062a61f4f5d378a5dbd53 (patch) | |
| tree | 1acb734aa5bc7527294bae99293df5c28e2cbff9 | |
| parent | b1f54ba34f9e036ab515bbac0c01d17300e1c79a (diff) | |
| download | linux-3.10-9e8e83d1ba0b248de34062a61f4f5d378a5dbd53.tar.gz linux-3.10-9e8e83d1ba0b248de34062a61f4f5d378a5dbd53.tar.bz2 linux-3.10-9e8e83d1ba0b248de34062a61f4f5d378a5dbd53.zip | |
82596 warning fixes
drivers/net/82596.c: In function 'i596_start_xmit':
drivers/net/82596.c:1069: warning: cast from pointer to integer of different size
drivers/net/82596.c: In function 'i82596_probe':
drivers/net/82596.c:1249: warning: format '%d' expects type 'int', but argument 4 has type 'long unsigned int'
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
| -rw-r--r-- | drivers/net/82596.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/82596.c b/drivers/net/82596.c index 8236f26ffd4..640d7ca2ebc 100644 --- a/drivers/net/82596.c +++ b/drivers/net/82596.c @@ -1066,8 +1066,8 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev) short length = skb->len; dev->trans_start = jiffies; - DEB(DEB_STARTTX,printk(KERN_DEBUG "%s: i596_start_xmit(%x,%x) called\n", dev->name, - skb->len, (unsigned int)skb->data)); + DEB(DEB_STARTTX,printk(KERN_DEBUG "%s: i596_start_xmit(%x,%p) called\n", + dev->name, skb->len, skb->data)); if (skb->len < ETH_ZLEN) { if (skb_padto(skb, ETH_ZLEN)) @@ -1246,7 +1246,8 @@ struct net_device * __init i82596_probe(int unit) dev->priv = (void *)(dev->mem_start); lp = dev->priv; - DEB(DEB_INIT,printk(KERN_DEBUG "%s: lp at 0x%08lx (%d bytes), lp->scb at 0x%08lx\n", + DEB(DEB_INIT,printk(KERN_DEBUG "%s: lp at 0x%08lx (%zd bytes), " + "lp->scb at 0x%08lx\n", dev->name, (unsigned long)lp, sizeof(struct i596_private), (unsigned long)&lp->scb)); memset((void *) lp, 0, sizeof(struct i596_private)); |