V4L/DVB (7690): pvrusb2-dvb: Remove digital_up flag

Other pvrusb2-dvb changes have made the digital_up flag obsolete.  So
kill it.

Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

2 files changed, 6 insertions, 12 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-dvb.c b/drivers/media/video/pvrusb2/pvrusb2-dvb.c
index 38077b2c5282..f32d052ff4e6 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-dvb.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-dvb.c
@@ -293,8 +293,6 @@ static int pvr2_dvb_adapter_init(struct pvr2_dvb_adapter *adap)
 
         dvb_net_init(&adap->dvb_adap, &adap->dvb_net, &adap->demux.dmx);
 
-        adap->digital_up = 1;
-
         return 0;
 
 err_dmx_dev:
@@ -307,15 +305,12 @@ err:
 
 static int pvr2_dvb_adapter_exit(struct pvr2_dvb_adapter *adap)
 {
-        if (adap->digital_up) {
-                printk(KERN_DEBUG "unregistering DVB devices\n");
-                dvb_net_release(&adap->dvb_net);
-                adap->demux.dmx.close(&adap->demux.dmx);
-                dvb_dmxdev_release(&adap->dmxdev);
-                dvb_dmx_release(&adap->demux);
-                dvb_unregister_adapter(&adap->dvb_adap);
-                adap->digital_up = 0;
-        }
+        printk(KERN_DEBUG "unregistering DVB devices\n");
+        dvb_net_release(&adap->dvb_net);
+        adap->demux.dmx.close(&adap->demux.dmx);
+        dvb_dmxdev_release(&adap->dmxdev);
+        dvb_dmx_release(&adap->demux);
+        dvb_unregister_adapter(&adap->dvb_adap);
         return 0;
 }
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-dvb.h b/drivers/media/video/pvrusb2/pvrusb2-dvb.h
index 1326f6f455a6..e37cb7bc2fc6 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-dvb.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-dvb.h
@@ -25,7 +25,6 @@ struct pvr2_dvb_adapter {
         struct task_struct      *thread;
         struct mutex            lock;
 
-        unsigned int            digital_up:1;
         unsigned int            stream_run:1;
 
         wait_queue_head_t       buffer_wait_data;