From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed, 1 Jun 2011 16:03:12 +0000 (-0300)
Subject: dvb_net: Simplify the code if DVB NET is not defined
X-Git-Tag: MMI-PSA29.97-13-9~18729^2~408
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fcc8e7d8c0e228cf032de0df049a91d5d2bfd0e9;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

dvb_net: Simplify the code if DVB NET is not defined

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/dvb/dvb-core/dvb_net.h b/drivers/media/dvb/dvb-core/dvb_net.h
index cfd2c46bd5d9..1e53acd50cf4 100644
--- a/drivers/media/dvb/dvb-core/dvb_net.h
+++ b/drivers/media/dvb/dvb-core/dvb_net.h
@@ -42,32 +42,25 @@ struct dvb_net {
 	struct dmx_demux *demux;
 };
 
-
 void dvb_net_release(struct dvb_net *);
 int  dvb_net_init(struct dvb_adapter *, struct dvb_net *, struct dmx_demux *);
 
-#endif
-
-#ifndef CONFIG_DVB_NET
-
-struct dvb_dev_stub;
+#else
 
 struct dvb_net {
-	struct dvb_dev_stub *dvbdev;
+	struct dvb_device *dvbdev;
 };
 
 static inline void dvb_net_release(struct dvb_net *dvbnet)
 {
-	dvbnet->dvbdev = 0;
 }
 
 static inline int dvb_net_init(struct dvb_adapter *adap,
 			       struct dvb_net *dvbnet, struct dmx_demux *dmx)
 {
-	dvbnet->dvbdev = (void *)1;
 	return 0;
 }
 
-#endif
+#endif /* ifdef CONFIG_DVB_NET */
 
 #endif