diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-01-09 12:25:28 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-09 12:25:28 -0500 |
commit | e18828e43a52fb9a792938840cc32cbb2a9e1a5c (patch) | |
tree | 8f85b0bf6254e3f936190cea65703cdcf91523ca | |
parent | 67f1570a0659abba5efbf55cc986187af61bdd52 (diff) |
V4L/DVB (3179): Fix 64-bit compile warnings
- Fix 64-bit compile warnings
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
-rw-r--r-- | drivers/media/common/saa7146_hlp.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-core/dvb_frontend.c | 8 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-core/dvb_net.c | 4 | ||||
-rw-r--r-- | drivers/media/dvb/frontends/bcm3510.c | 4 | ||||
-rw-r--r-- | drivers/media/dvb/frontends/or51211.c | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/drivers/media/common/saa7146_hlp.c b/drivers/media/common/saa7146_hlp.c index ec52dff8cb69..be34ec430470 100644 --- a/drivers/media/common/saa7146_hlp.c +++ b/drivers/media/common/saa7146_hlp.c | |||
@@ -562,7 +562,7 @@ static void saa7146_set_position(struct saa7146_dev *dev, int w_x, int w_y, int | |||
562 | 562 | ||
563 | int b_depth = vv->ov_fmt->depth; | 563 | int b_depth = vv->ov_fmt->depth; |
564 | int b_bpl = vv->ov_fb.fmt.bytesperline; | 564 | int b_bpl = vv->ov_fb.fmt.bytesperline; |
565 | u32 base = (u32)vv->ov_fb.base; | 565 | u32 base = (u32)(unsigned long)vv->ov_fb.base; |
566 | 566 | ||
567 | struct saa7146_video_dma vdma1; | 567 | struct saa7146_video_dma vdma1; |
568 | 568 | ||
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c index 9b5fa540e1e7..a53e95f35a53 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/drivers/media/dvb/dvb-core/dvb_frontend.c | |||
@@ -788,7 +788,7 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file, | |||
788 | 788 | ||
789 | case FE_DISHNETWORK_SEND_LEGACY_CMD: | 789 | case FE_DISHNETWORK_SEND_LEGACY_CMD: |
790 | if (fe->ops->dishnetwork_send_legacy_command) { | 790 | if (fe->ops->dishnetwork_send_legacy_command) { |
791 | err = fe->ops->dishnetwork_send_legacy_command(fe, (unsigned int) parg); | 791 | err = fe->ops->dishnetwork_send_legacy_command(fe, (unsigned long) parg); |
792 | fepriv->state = FESTATE_DISEQC; | 792 | fepriv->state = FESTATE_DISEQC; |
793 | fepriv->status = 0; | 793 | fepriv->status = 0; |
794 | } else if (fe->ops->set_voltage) { | 794 | } else if (fe->ops->set_voltage) { |
@@ -808,7 +808,7 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file, | |||
808 | * initialization, so parg is 8 bits and does not | 808 | * initialization, so parg is 8 bits and does not |
809 | * include the initialization or start bit | 809 | * include the initialization or start bit |
810 | */ | 810 | */ |
811 | unsigned int cmd = ((unsigned int) parg) << 1; | 811 | unsigned int cmd = ((unsigned long) parg) << 1; |
812 | struct timeval nexttime; | 812 | struct timeval nexttime; |
813 | struct timeval tv[10]; | 813 | struct timeval tv[10]; |
814 | int i; | 814 | int i; |
@@ -855,7 +855,7 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file, | |||
855 | 855 | ||
856 | case FE_ENABLE_HIGH_LNB_VOLTAGE: | 856 | case FE_ENABLE_HIGH_LNB_VOLTAGE: |
857 | if (fe->ops->enable_high_lnb_voltage) | 857 | if (fe->ops->enable_high_lnb_voltage) |
858 | err = fe->ops->enable_high_lnb_voltage(fe, (int) parg); | 858 | err = fe->ops->enable_high_lnb_voltage(fe, (long) parg); |
859 | break; | 859 | break; |
860 | 860 | ||
861 | case FE_SET_FRONTEND: { | 861 | case FE_SET_FRONTEND: { |
@@ -934,7 +934,7 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file, | |||
934 | break; | 934 | break; |
935 | 935 | ||
936 | case FE_SET_FRONTEND_TUNE_MODE: | 936 | case FE_SET_FRONTEND_TUNE_MODE: |
937 | fepriv->tune_mode_flags = (unsigned int) parg; | 937 | fepriv->tune_mode_flags = (unsigned long) parg; |
938 | break; | 938 | break; |
939 | }; | 939 | }; |
940 | 940 | ||
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c index 86bba81e851e..95d991febea6 100644 --- a/drivers/media/dvb/dvb-core/dvb_net.c +++ b/drivers/media/dvb/dvb-core/dvb_net.c | |||
@@ -1296,9 +1296,9 @@ static int dvb_net_do_ioctl(struct inode *inode, struct file *file, | |||
1296 | 1296 | ||
1297 | if (!capable(CAP_SYS_ADMIN)) | 1297 | if (!capable(CAP_SYS_ADMIN)) |
1298 | return -EPERM; | 1298 | return -EPERM; |
1299 | if ((unsigned int) parg >= DVB_NET_DEVICES_MAX) | 1299 | if ((unsigned long) parg >= DVB_NET_DEVICES_MAX) |
1300 | return -EINVAL; | 1300 | return -EINVAL; |
1301 | ret = dvb_net_remove_if(dvbnet, (unsigned int) parg); | 1301 | ret = dvb_net_remove_if(dvbnet, (unsigned long) parg); |
1302 | if (!ret) | 1302 | if (!ret) |
1303 | module_put(dvbdev->adapter->module); | 1303 | module_put(dvbdev->adapter->module); |
1304 | return ret; | 1304 | return ret; |
diff --git a/drivers/media/dvb/frontends/bcm3510.c b/drivers/media/dvb/frontends/bcm3510.c index 8ceb9a33c7af..e9b363625c50 100644 --- a/drivers/media/dvb/frontends/bcm3510.c +++ b/drivers/media/dvb/frontends/bcm3510.c | |||
@@ -623,13 +623,13 @@ static int bcm3510_download_firmware(struct dvb_frontend* fe) | |||
623 | err("could not load firmware (%s): %d",BCM3510_DEFAULT_FIRMWARE,ret); | 623 | err("could not load firmware (%s): %d",BCM3510_DEFAULT_FIRMWARE,ret); |
624 | return ret; | 624 | return ret; |
625 | } | 625 | } |
626 | deb_info("got firmware: %d\n",fw->size); | 626 | deb_info("got firmware: %zd\n",fw->size); |
627 | 627 | ||
628 | b = fw->data; | 628 | b = fw->data; |
629 | for (i = 0; i < fw->size;) { | 629 | for (i = 0; i < fw->size;) { |
630 | addr = le16_to_cpu( *( (u16 *)&b[i] ) ); | 630 | addr = le16_to_cpu( *( (u16 *)&b[i] ) ); |
631 | len = le16_to_cpu( *( (u16 *)&b[i+2] ) ); | 631 | len = le16_to_cpu( *( (u16 *)&b[i+2] ) ); |
632 | deb_info("firmware chunk, addr: 0x%04x, len: 0x%04x, total length: 0x%04x\n",addr,len,fw->size); | 632 | deb_info("firmware chunk, addr: 0x%04x, len: 0x%04x, total length: 0x%04zx\n",addr,len,fw->size); |
633 | if ((ret = bcm3510_write_ram(st,addr,&b[i+4],len)) < 0) { | 633 | if ((ret = bcm3510_write_ram(st,addr,&b[i+4],len)) < 0) { |
634 | err("firmware download failed: %d\n",ret); | 634 | err("firmware download failed: %d\n",ret); |
635 | return ret; | 635 | return ret; |
diff --git a/drivers/media/dvb/frontends/or51211.c b/drivers/media/dvb/frontends/or51211.c index 531f76246e5f..8d631ca7aaf0 100644 --- a/drivers/media/dvb/frontends/or51211.c +++ b/drivers/media/dvb/frontends/or51211.c | |||
@@ -112,7 +112,7 @@ static int or51211_load_firmware (struct dvb_frontend* fe, | |||
112 | u8 tudata[585]; | 112 | u8 tudata[585]; |
113 | int i; | 113 | int i; |
114 | 114 | ||
115 | dprintk("Firmware is %d bytes\n",fw->size); | 115 | dprintk("Firmware is %zd bytes\n",fw->size); |
116 | 116 | ||
117 | /* Get eprom data */ | 117 | /* Get eprom data */ |
118 | tudata[0] = 17; | 118 | tudata[0] = 17; |