Skip to contentSkip to conversation

- Fix 64-bit compile warnings

PATCH In review Mauro Carvalho Chehab 2 participants 2 messages Dec 18, 2005 Media (V4L/DVB)

lore
Share & tools
lore

Mauro Carvalho Chehab

author
#0 lore raw

PATCH 1/5 - Fix 64-bit compile warnings

Fix 64-bit compile warnings

Signed-off-by Hans Verkuil <[email protected]>
Signed-off-by Mauro Carvalho Chehab <[email protected]>

---

 drivers/media/common/saa7146_hlp.c        |    2 +-
 drivers/media/dvb/dvb-core/dvb_frontend.c |    6 +++---
 drivers/media/dvb/dvb-core/dvb_net.c      |    4 ++--
 drivers/media/dvb/frontends/bcm3510.c     |    4 ++--
 drivers/media/dvb/frontends/or51211.c     |    2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

e0c2a5cc6f2365d95917f3a3fffadd9f88d28746

drivers/media/common/saa7146_hlp.c +1 -1
index ec52dff..be34ec4 100644
@@ -562,7 +562,7 @@ static void saa7146_set_position(struct 
 
 	int b_depth = vv->ov_fmt->depth;
 	int b_bpl = vv->ov_fb.fmt.bytesperline;
-	u32 base = (u32)vv->ov_fb.base;
+	u32 base = (u32)(unsigned long)vv->ov_fb.base;
 
 	struct	saa7146_video_dma vdma1;
drivers/media/dvb/dvb-core/dvb_frontend.c +3 -3
index 95ea509..ae9c1d2 100644
@@ -747,7 +747,7 @@ static int dvb_frontend_ioctl(struct ino
 
 	case FE_DISHNETWORK_SEND_LEGACY_CMD:
 		if (fe->ops->dishnetwork_send_legacy_command) {
-			err = fe->ops->dishnetwork_send_legacy_command(fe, (unsigned int) parg);
+			err = fe->ops->dishnetwork_send_legacy_command(fe, (unsigned long) parg);
 			fepriv->state = FESTATE_DISEQC;
 			fepriv->status = 0;
 		} else if (fe->ops->set_voltage) {

@@ -767,7 +767,7 @@ static int dvb_frontend_ioctl(struct ino
 			 * initialization, so parg is 8 bits and does not
 			 * include the initialization or start bit
 			 */
-			unsigned int cmd = ((unsigned int) parg) << 1;
+			unsigned int cmd = ((unsigned long) parg) << 1;
 			struct timeval nexttime;
 			struct timeval tv[10];
 			int i;

@@ -814,7 +814,7 @@ static int dvb_frontend_ioctl(struct ino
 
 	case FE_ENABLE_HIGH_LNB_VOLTAGE:
 		if (fe->ops->enable_high_lnb_voltage)
-			err = fe->ops->enable_high_lnb_voltage(fe, (int) parg);
+			err = fe->ops->enable_high_lnb_voltage(fe, (long) parg);
 		break;
 
 	case FE_SET_FRONTEND: {
drivers/media/dvb/dvb-core/dvb_net.c +2 -2
index 86bba81..95d991f 100644
@@ -1296,9 +1296,9 @@ static int dvb_net_do_ioctl(struct inode
 
 		if (!capable(CAP_SYS_ADMIN))
 			return -EPERM;
-		if ((unsigned int) parg >= DVB_NET_DEVICES_MAX)
+		if ((unsigned long) parg >= DVB_NET_DEVICES_MAX)
 			return -EINVAL;
-		ret = dvb_net_remove_if(dvbnet, (unsigned int) parg);
+		ret = dvb_net_remove_if(dvbnet, (unsigned long) parg);
 		if (!ret)
 			module_put(dvbdev->adapter->module);
 		return ret;
drivers/media/dvb/frontends/bcm3510.c +2 -2
index 8ceb9a3..e9b3636 100644
@@ -623,13 +623,13 @@ static int bcm3510_download_firmware(str
 		err("could not load firmware (%s): %d",BCM3510_DEFAULT_FIRMWARE,ret);
 		return ret;
 	}
-	deb_info("got firmware: %d\n",fw->size);
+	deb_info("got firmware: %zd\n",fw->size);
 
 	b = fw->data;
 	for (i = 0; i < fw->size;) {
 		addr = le16_to_cpu( *( (u16 *)&b[i] ) );
 		len  = le16_to_cpu( *( (u16 *)&b[i+2] ) );
-		deb_info("firmware chunk, addr: 0x%04x, len: 0x%04x, total length: 0x%04x\n",addr,len,fw->size);
+		deb_info("firmware chunk, addr: 0x%04x, len: 0x%04x, total length: 0x%04zx\n",addr,len,fw->size);
 		if ((ret = bcm3510_write_ram(st,addr,&b[i+4],len)) < 0) {
 			err("firmware download failed: %d\n",ret);
 			return ret;
drivers/media/dvb/frontends/or51211.c +1 -1
index 531f762..8d631ca 100644
@@ -112,7 +112,7 @@ static int or51211_load_firmware (struct
 	u8 tudata[585];
 	int i;
 
-	dprintk("Firmware is %d bytes\n",fw->size);
+	dprintk("Firmware is %zd bytes\n",fw->size);
 
 	/* Get eprom data */
 	tudata[0] = 17;
Signature · 1 line
0.99.9.GIT
#1 lore raw

drivers/media/common/saa7146_hlp.c static void saa7146_set_position(struct · line 565

Quoted 11 lines · Mauro Carvalho Chehab

Fix 64-bit compile warnings

drivers/media/common/saa7146_hlp.c +1 -1
index ec52dff..be34ec4 100644
@@ -562,7 +562,7 @@ static void saa7146_set_position(struct 
 
 	int b_depth = vv->ov_fmt->depth;
 	int b_bpl = vv->ov_fb.fmt.bytesperline;
-	u32 base = (u32)vv->ov_fb.base;
+	u32 base = (u32)(unsigned long)vv->ov_fb.base;

That's not "fix", that's "confuse gcc so it doesn't notice the problem anymore"...