Commit 28b3389a authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] 64bit portability fixes

assorted 64bit issues - extraction of number passed in pointer, use of
%zd for size_t, ssize_t instead of int as return value of ->read(), %p
for pointers instead of casting to int and using %x.
Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0598e144
...@@ -1267,7 +1267,8 @@ static int uni0299_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg) ...@@ -1267,7 +1267,8 @@ static int uni0299_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
state->tuner_type); state->tuner_type);
case FE_DISHNETWORK_SEND_LEGACY_CMD: case FE_DISHNETWORK_SEND_LEGACY_CMD:
return stv0299_send_legacy_dish_cmd (i2c, (u32) arg, return stv0299_send_legacy_dish_cmd (i2c,
(u32)(unsigned long)arg,
state->tuner_type); state->tuner_type);
case FE_GET_TUNE_SETTINGS: case FE_GET_TUNE_SETTINGS:
......
...@@ -363,7 +363,7 @@ static int blackbird_load_firmware(struct cx8802_dev *dev) ...@@ -363,7 +363,7 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)
} }
if (firmware->size != BLACKBIRD_FIRM_IMAGE_SIZE) { if (firmware->size != BLACKBIRD_FIRM_IMAGE_SIZE) {
dprintk(0, "ERROR: Firmware size mismatch (have %ld, expected %d)\n", dprintk(0, "ERROR: Firmware size mismatch (have %zd, expected %d)\n",
firmware->size, BLACKBIRD_FIRM_IMAGE_SIZE); firmware->size, BLACKBIRD_FIRM_IMAGE_SIZE);
return -1; return -1;
} }
......
...@@ -865,7 +865,7 @@ static int pms_ioctl(struct inode *inode, struct file *file, ...@@ -865,7 +865,7 @@ static int pms_ioctl(struct inode *inode, struct file *file,
return video_usercopy(inode, file, cmd, arg, pms_do_ioctl); return video_usercopy(inode, file, cmd, arg, pms_do_ioctl);
} }
static int pms_read(struct file *file, char __user *buf, static ssize_t pms_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
struct video_device *v = video_devdata(file); struct video_device *v = video_devdata(file);
......
...@@ -914,7 +914,7 @@ static void _dsp_create_task_tree (cs46xx_t *chip,u32 * task_data, u32 dest, in ...@@ -914,7 +914,7 @@ static void _dsp_create_task_tree (cs46xx_t *chip,u32 * task_data, u32 dest, in
int i; int i;
for (i = 0; i < size; ++i) { for (i = 0; i < size; ++i) {
if (debug_tree) printk ("addr %08x, val %08x\n",(int)spdst,task_data[i]); if (debug_tree) printk ("addr %p, val %08x\n", spdst,task_data[i]);
writel(task_data[i],spdst); writel(task_data[i],spdst);
spdst += sizeof(u32); spdst += sizeof(u32);
} }
...@@ -928,7 +928,7 @@ static void _dsp_create_scb (cs46xx_t *chip,u32 * scb_data, u32 dest) ...@@ -928,7 +928,7 @@ static void _dsp_create_scb (cs46xx_t *chip,u32 * scb_data, u32 dest)
int i; int i;
for (i = 0; i < 0x10; ++i) { for (i = 0; i < 0x10; ++i) {
if (debug_scb) printk ("addr %08x, val %08x\n",(int)spdst,scb_data[i]); if (debug_scb) printk ("addr %p, val %08x\n", spdst,scb_data[i]);
writel(scb_data[i],spdst); writel(scb_data[i],spdst);
spdst += sizeof(u32); spdst += sizeof(u32);
} }
......
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