Commit 218721b8 authored by Andreas Oberritter's avatar Andreas Oberritter Committed by Linus Torvalds
Browse files

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



Removed unused descramble_mac_address and descramble_section_payload callbacks.

Signed-off-by: default avatarAndreas Oberritter <obi@linuxtv.org>
Signed-off-by: default avatarJohannes Stezenbach <js@linuxtv.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 93653467

drivers/media/dvb/dvb-core/demux.h

+0 −11
Original line number Diff line number Diff line
@@ -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,

drivers/media/dvb/dvb-core/dvb_demux.c

+0 −3
Original line number Diff line number Diff line
@@ -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;