Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 703cb2cb authored by Adrian Bunk's avatar Adrian Bunk Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (3428): drivers/media/dvb/ possible cleanups 



- Make needlessly global code static
- #if 0 the following unused global functions:
- b2c2/flexcop-dma.c: flexcop_dma_control_packet_irq()
- b2c2/flexcop-dma.c: flexcop_dma_config_packet_count()

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarPatrick Boettcher <pb@linuxtv.org>
Signed-off-by: default avatarMichael Krufky <mkrufky@m1k.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 8a4b275f

drivers/media/dvb/b2c2/flexcop-common.h

+0 −2
Original line number Diff line number Diff line
@@ -116,11 +116,9 @@ void flexcop_dma_free(struct flexcop_dma *dma); 


int flexcop_dma_control_timer_irq(struct flexcop_device *fc, flexcop_dma_index_t no, int onoff);

int flexcop_dma_control_size_irq(struct flexcop_device *fc, flexcop_dma_index_t no, int onoff);

int flexcop_dma_control_packet_irq(struct flexcop_device *fc, flexcop_dma_index_t no, int onoff);

int flexcop_dma_config(struct flexcop_device *fc, struct flexcop_dma *dma, flexcop_dma_index_t dma_idx);

int flexcop_dma_xfer_control(struct flexcop_device *fc, flexcop_dma_index_t dma_idx, flexcop_dma_addr_index_t index, int onoff);

int flexcop_dma_config_timer(struct flexcop_device *fc, flexcop_dma_index_t dma_idx, u8 cycles);

int flexcop_dma_config_packet_count(struct flexcop_device *fc, flexcop_dma_index_t dma_idx, u8 packets);



/* from flexcop-eeprom.c */

/* the PCI part uses this call to get the MAC address, the USB part has its own */

drivers/media/dvb/b2c2/flexcop-dma.c

+0 −35
Original line number Diff line number Diff line
@@ -169,38 +169,3 @@ int flexcop_dma_config_timer(struct flexcop_device *fc, 
}

EXPORT_SYMBOL(flexcop_dma_config_timer);

/* packet IRQ does not exist in FCII or FCIIb - according to data book and tests */

int flexcop_dma_control_packet_irq(struct flexcop_device *fc,

		flexcop_dma_index_t no,

		int onoff)

{

	flexcop_ibi_value v = fc->read_ibi_reg(fc,ctrl_208);



	deb_rdump("reg: %03x: %x\n",ctrl_208,v.raw);

	if (no & FC_DMA_1)

		v.ctrl_208.DMA1_Size_IRQ_Enable_sig = onoff;



	if (no & FC_DMA_2)

		v.ctrl_208.DMA2_Size_IRQ_Enable_sig = onoff;



	fc->write_ibi_reg(fc,ctrl_208,v);

	deb_rdump("reg: %03x: %x\n",ctrl_208,v.raw);



	return 0;

}

EXPORT_SYMBOL(flexcop_dma_control_packet_irq);



int flexcop_dma_config_packet_count(struct flexcop_device *fc,

		flexcop_dma_index_t dma_idx,

		u8 packets)

{

	flexcop_ibi_register r = (dma_idx & FC_DMA_1) ? dma1_004 : dma2_014;

	flexcop_ibi_value v = fc->read_ibi_reg(fc,r);



	flexcop_dma_remap(fc,dma_idx,1);



	v.dma_0x4_remap.DMA_maxpackets = packets;

	fc->write_ibi_reg(fc,r,v);

	return 0;

}

EXPORT_SYMBOL(flexcop_dma_config_packet_count);

drivers/media/dvb/b2c2/flexcop-misc.c

+3 −3
Original line number Diff line number Diff line
@@ -36,14 +36,14 @@ void flexcop_determine_revision(struct flexcop_device *fc) 
	/* bus parts have to decide if hw pid filtering is used or not. */

}



const char *flexcop_revision_names[] = {

static const char *flexcop_revision_names[] = {

	"Unkown chip",

	"FlexCopII",

	"FlexCopIIb",

	"FlexCopIII",

};



const char *flexcop_device_names[] = {

static const char *flexcop_device_names[] = {

	"Unkown device",

	"Air2PC/AirStar 2 DVB-T",

	"Air2PC/AirStar 2 ATSC 1st generation",
@@ -54,7 +54,7 @@ const char *flexcop_device_names[] = { 
	"Air2PC/AirStar 2 ATSC 3rd generation (HD5000)",

};



const char *flexcop_bus_names[] = {

static const char *flexcop_bus_names[] = {

	"USB",

	"PCI",

};

drivers/media/dvb/b2c2/flexcop-reg.h

+0 −4
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ typedef enum { 
	FLEXCOP_III,

} flexcop_revision_t;



extern const char *flexcop_revision_names[];



typedef enum {

	FC_UNK = 0,

	FC_AIR_DVB,
@@ -34,8 +32,6 @@ typedef enum { 
	FC_PCI,

} flexcop_bus_t;



extern const char *flexcop_device_names[];



/* FlexCop IBI Registers */

#if defined(__LITTLE_ENDIAN)

	#include "flexcop_ibi_value_le.h"

drivers/media/dvb/dvb-usb/cxusb.c

+4 −4
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static int cxusb_rc_query(struct dvb_usb_device *d, u32 *event, int *state) 
	return 0;

}



struct dvb_usb_rc_key dvico_mce_rc_keys[] = {

static struct dvb_usb_rc_key dvico_mce_rc_keys[] = {

	{ 0xfe, 0x02, KEY_TV },

	{ 0xfe, 0x0e, KEY_MP3 },

	{ 0xfe, 0x1a, KEY_DVD },
@@ -273,7 +273,7 @@ static int cxusb_mt352_demod_init(struct dvb_frontend* fe) 
	return 0;

}



struct cx22702_config cxusb_cx22702_config = {

static struct cx22702_config cxusb_cx22702_config = {

	.demod_address = 0x63,



	.output_mode = CX22702_PARALLEL_OUTPUT,
@@ -282,13 +282,13 @@ struct cx22702_config cxusb_cx22702_config = { 
	.pll_set  = dvb_usb_pll_set_i2c,

};



struct lgdt330x_config cxusb_lgdt330x_config = {

static struct lgdt330x_config cxusb_lgdt330x_config = {

	.demod_address = 0x0e,

	.demod_chip    = LGDT3303,

	.pll_set       = dvb_usb_pll_set_i2c,

};



struct mt352_config cxusb_dee1601_config = {

static struct mt352_config cxusb_dee1601_config = {

	.demod_address = 0x0f,

	.demod_init    = cxusb_dee1601_demod_init,

	.pll_set       = dvb_usb_pll_set,