From: Andreas Oberritter Removed unused descramble_mac_address and descramble_section_payload callbacks. Signed-off-by: Andreas Oberritter Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton --- drivers/media/dvb/dvb-core/demux.h | 11 ----------- drivers/media/dvb/dvb-core/dvb_demux.c | 3 --- 2 files changed, 14 deletions(-) diff -puN drivers/media/dvb/dvb-core/demux.h~dvb-core-dvb_demux-remove-unsused-descramble-callbacks drivers/media/dvb/dvb-core/demux.h --- devel/drivers/media/dvb/dvb-core/demux.h~dvb-core-dvb_demux-remove-unsused-descramble-callbacks 2005-09-04 16:50:57.000000000 -0700 +++ devel-akpm/drivers/media/dvb/dvb-core/demux.h 2005-09-04 16:50:57.000000000 -0700 @@ -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 -puN drivers/media/dvb/dvb-core/dvb_demux.c~dvb-core-dvb_demux-remove-unsused-descramble-callbacks drivers/media/dvb/dvb-core/dvb_demux.c --- devel/drivers/media/dvb/dvb-core/dvb_demux.c~dvb-core-dvb_demux-remove-unsused-descramble-callbacks 2005-09-04 16:50:57.000000000 -0700 +++ devel-akpm/drivers/media/dvb/dvb-core/dvb_demux.c 2005-09-04 16:50:57.000000000 -0700 @@ -1232,9 +1232,6 @@ int dvb_dmx_init(struct dvb_demux *dvbde 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; _