[media] dvb_usb_v2: remove num_frontends_initialized from dvb_usb_ada…

…pter We can live easily without that variable. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
git-mirror · Aug 4, 2012 · dd5e52c · dd5e52c
1 parent 6dca4ea
commit dd5e52c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/drivers/media/dvb/dvb-usb/dvb_usb.h b/drivers/media/dvb/dvb-usb/dvb_usb.h
@@ -288,7 +288,6 @@ struct dvb_usb_adapter {
 	int (*fe_sleep[MAX_NO_OF_FE_PER_ADAP]) (struct dvb_frontend *);
 
 	int active_fe;
-	int num_frontends_initialized;
 };
 
 /**

diff --git a/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c b/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c
@@ -386,8 +386,6 @@ int dvb_usbv2_adapter_frontend_init(struct dvb_usb_adapter *adap)
 		}
 	}
 
-	adap->num_frontends_initialized = count_registered;
-
 	return 0;
 
 err_dvb_unregister_frontend:
@@ -410,14 +408,12 @@ int dvb_usbv2_adapter_frontend_exit(struct dvb_usb_adapter *adap)
 	int i;
 	pr_debug("%s: adap=%d\n", __func__, adap->id);
 
-	for (i = adap->num_frontends_initialized - 1; i >= 0; i--) {
+	for (i = MAX_NO_OF_FE_PER_ADAP - 1; i >= 0; i--) {
 		if (adap->fe[i]) {
 			dvb_unregister_frontend(adap->fe[i]);
 			dvb_frontend_detach(adap->fe[i]);
 		}
 	}
 
-	adap->num_frontends_initialized = 0;
-
 	return 0;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -288,7 +288,6 @@ struct dvb_usb_adapter { @@
     	int (*fe_sleep[MAX_NO_OF_FE_PER_ADAP]) (struct dvb_frontend *);
     	int active_fe;
-    	int num_frontends_initialized;
     };
     /**
@@ Expand Down @@