Commit 759359ed authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] 64bit portability fixes (pointer-to-int stuff)

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a408e529
...@@ -1145,8 +1145,8 @@ static int dst_attach (struct dvb_i2c_bus *i2c, void **data) ...@@ -1145,8 +1145,8 @@ static int dst_attach (struct dvb_i2c_bus *i2c, void **data)
} }
dst_init (dst); dst_init (dst);
dprintk("%s: register dst %8.8x bt %8.8x i2c %8.8x\n", __FUNCTION__, dprintk("%s: register dst %p bt %p i2c %p\n", __FUNCTION__,
(u32)dst, (u32)(dst->bt), (u32)(dst->i2c)); dst, dst->bt, dst->i2c);
info = &dst_info_sat; info = &dst_info_sat;
if (dst->dst_type == DST_TYPE_IS_TERR) if (dst->dst_type == DST_TYPE_IS_TERR)
...@@ -1162,7 +1162,7 @@ static int dst_attach (struct dvb_i2c_bus *i2c, void **data) ...@@ -1162,7 +1162,7 @@ static int dst_attach (struct dvb_i2c_bus *i2c, void **data)
static void dst_detach (struct dvb_i2c_bus *i2c, void *data) static void dst_detach (struct dvb_i2c_bus *i2c, void *data)
{ {
dvb_unregister_frontend (dst_ioctl, i2c); dvb_unregister_frontend (dst_ioctl, i2c);
dprintk("%s: unregister dst %8.8x\n", __FUNCTION__, (u32)(data)); dprintk("%s: unregister dst %p\n", __FUNCTION__, data);
if (data) if (data)
kfree(data); kfree(data);
} }
......
...@@ -2265,8 +2265,8 @@ zoran_do_ioctl (struct inode *inode, ...@@ -2265,8 +2265,8 @@ zoran_do_ioctl (struct inode *inode,
dprintk(3, dprintk(3,
KERN_DEBUG KERN_DEBUG
"%s: VIDIOCSFBUF - base=0x%x, w=%d, h=%d, depth=%d, bpl=%d\n", "%s: VIDIOCSFBUF - base=%p, w=%d, h=%d, depth=%d, bpl=%d\n",
ZR_DEVNAME(zr), (u32) vbuf->base, vbuf->width, ZR_DEVNAME(zr), vbuf->base, vbuf->width,
vbuf->height, vbuf->depth, vbuf->bytesperline); vbuf->height, vbuf->depth, vbuf->bytesperline);
for (i = 0; i < zoran_num_formats; i++) for (i = 0; i < zoran_num_formats; i++)
......
...@@ -94,7 +94,7 @@ int ata_scsi_ioctl(struct scsi_device *scsidev, int cmd, void __user *arg) ...@@ -94,7 +94,7 @@ int ata_scsi_ioctl(struct scsi_device *scsidev, int cmd, void __user *arg)
return 0; return 0;
case ATA_IOC_SET_IO32: case ATA_IOC_SET_IO32:
val = (long) arg; val = (unsigned long) arg;
if (val != 0) if (val != 0)
return -EINVAL; return -EINVAL;
return 0; return 0;
......
...@@ -2961,8 +2961,8 @@ wffx_memset (int page, ...@@ -2961,8 +2961,8 @@ wffx_memset (int page,
if (i != cnt) { if (i != cnt) {
printk (KERN_WARNING LOGNAME printk (KERN_WARNING LOGNAME
"FX memset " "FX memset "
"(0x%x, 0x%x, 0x%x, %d) incomplete\n", "(0x%x, 0x%x, %p, %d) incomplete\n",
page, addr, (int) data, cnt); page, addr, data, cnt);
return -(EIO); return -(EIO);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment