[PATCH] dvb: core: dvb_demux: remove unsused descramble callbacks

Removed unused descramble_mac_address and descramble_section_payload callbacks.

Signed-off-by: Andreas Oberritter <obi@linuxtv.org>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/media/dvb/dvb-core/demux.h b/drivers/media/dvb/dvb-core/demux.h
index 608461f090fedfa6ae52d859711b7caa351e8eec..ee5be59759ee3ac259795d8dc3999a3b9d906f88 100644 (file)
--- a/drivers/media/dvb/dvb-core/demux.h
+++ b/drivers/media/dvb/dvb-core/demux.h
@@ -260,17 +260,6 @@ struct dmx_demux {
                                      dmx_section_cb callback);
         int (*release_section_feed) (struct dmx_demux* demux,
                                     struct dmx_section_feed* feed);
-        int (*descramble_mac_address) (struct dmx_demux* demux,
-                                      u8* buffer1,
-                                      size_t buffer1_length,
-                                      u8* buffer2,
-                                      size_t buffer2_length,
-                                      u16 pid);
-        int (*descramble_section_payload) (struct dmx_demux* demux,
-                                          u8* buffer1,
-                                          size_t buffer1_length,
-                                          u8* buffer2, size_t buffer2_length,
-                                          u16 pid);
         int (*add_frontend) (struct dmx_demux* demux,
                             struct dmx_frontend* frontend);
         int (*remove_frontend) (struct dmx_demux* demux,

diff --git a/drivers/media/dvb/dvb-core/dvb_demux.c b/drivers/media/dvb/dvb-core/dvb_demux.c
index 8774a94ef01bd5299b1fc48fd5e148f8d271f2a9..6488206f54c885d5906c23874f852d1dbb4e81e7 100644 (file)
--- a/drivers/media/dvb/dvb-core/dvb_demux.c
+++ b/drivers/media/dvb/dvb-core/dvb_demux.c
@@ -1232,9 +1232,6 @@ int dvb_dmx_init(struct dvb_demux *dvbdemux)
        dmx->allocate_section_feed = dvbdmx_allocate_section_feed;
        dmx->release_section_feed = dvbdmx_release_section_feed;
 
-       dmx->descramble_mac_address = NULL;
-       dmx->descramble_section_payload = NULL;
-
        dmx->add_frontend = dvbdmx_add_frontend;
        dmx->remove_frontend = dvbdmx_remove_frontend;
        dmx->get_frontends = dvbdmx_get_frontends;