V4L/DVB (3194): Revert one 64-bit fix and improved other 64-bit fixes

- Reverted objectionable fix in saa7146_hlp.c
- Merged in improved dvb 64-bit fixes from Peter Beutner.

Signed-off-by: Peter Beutner <p.beutner@gmx.net>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

3 files changed, 6 insertions, 6 deletions

diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index a53e95f35a5..4a08c4ab673 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -104,7 +104,7 @@ struct dvb_frontend_private {
         unsigned int exit;
         unsigned int wakeup;
         fe_status_t status;
-        unsigned int tune_mode_flags;
+        unsigned long tune_mode_flags;
         unsigned int delay;
 
         /* swzigzag values */
@@ -808,13 +808,13 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
                          * initialization, so parg is 8 bits and does not
                          * include the initialization or start bit
                          */
-                        unsigned int cmd = ((unsigned long) parg) << 1;
+                        unsigned long cmd = ((unsigned long) parg) << 1;
                         struct timeval nexttime;
                         struct timeval tv[10];
                         int i;
                         u8 last = 1;
                         if (dvb_frontend_debug)
-                                printk("%s switch command: 0x%04x\n", __FUNCTION__, cmd);
+                                printk("%s switch command: 0x%04lx\n", __FUNCTION__, cmd);
                         do_gettimeofday(&nexttime);
                         if (dvb_frontend_debug)
                                 memcpy(&tv[0], &nexttime, sizeof(struct timeval));
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h
index f40ee4efbe3..70a6d14efda 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -83,8 +83,8 @@ struct dvb_frontend_ops {
         int (*diseqc_send_burst)(struct dvb_frontend* fe, fe_sec_mini_cmd_t minicmd);
         int (*set_tone)(struct dvb_frontend* fe, fe_sec_tone_mode_t tone);
         int (*set_voltage)(struct dvb_frontend* fe, fe_sec_voltage_t voltage);
-        int (*enable_high_lnb_voltage)(struct dvb_frontend* fe, int arg);
-        int (*dishnetwork_send_legacy_command)(struct dvb_frontend* fe, unsigned int cmd);
+        int (*enable_high_lnb_voltage)(struct dvb_frontend* fe, long arg);
+        int (*dishnetwork_send_legacy_command)(struct dvb_frontend* fe, unsigned long cmd);
         int (*i2c_gate_ctrl)(struct dvb_frontend* fe, int enable);
 };
 
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c
index 95d991febea..6711eb6a058 100644
--- a/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/drivers/media/dvb/dvb-core/dvb_net.c
@@ -1222,7 +1222,7 @@ static int dvb_net_add_if(struct dvb_net *dvbnet, u16 pid, u8 feedtype)
         return if_num;
 }
 
-static int dvb_net_remove_if(struct dvb_net *dvbnet, unsigned int num)
+static int dvb_net_remove_if(struct dvb_net *dvbnet, unsigned long num)
 {
         struct net_device *net = dvbnet->device[num];
         struct dvb_net_priv *priv;