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

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

V4L/DVB (4213): Cx88: cleanups 



remove the following unused hooks:
- cx88-blackbird.c: cx88_ioctl_hook()
- cx88-blackbird.c: cx88_ioctl_translator()
make the following needlessly global functions static:
- cx88-tvaudio.c: cx88_detect_nicam()
remove the following unused EXPORT_SYMBOL's:
- cx88-cards.c: cx88_bcount
- cx88-cards.c: cx88_subids
- cx88-cards.c: cx88_idcount
- cx88-cards.c: cx88_card_list
- cx88-cards.c: cx88_card_setup
- cx88-core.c: cx88_start_audio_dma
- cx88-core.c: cx88_stop_audio_dma
- cx88-i2c.c: cx88_i2c_init

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent d772bd03

drivers/media/video/cx88/cx88-blackbird.c

+4 −13
Original line number Diff line number Diff line
@@ -846,7 +846,7 @@ static int mpeg_do_ioctl(struct inode *inode, struct file *file, 
				  BLACKBIRD_MPEG_CAPTURE,

				  BLACKBIRD_RAW_BITS_NONE);



		cx88_do_ioctl( inode, file, 0, dev->core, cmd, arg, cx88_ioctl_hook );

		cx88_do_ioctl(inode, file, 0, dev->core, cmd, arg, mpeg_do_ioctl);



		blackbird_initialize_codec(dev);

		cx88_set_scale(dev->core, dev->width, dev->height,
@@ -855,15 +855,11 @@ static int mpeg_do_ioctl(struct inode *inode, struct file *file, 
	}



	default:

		return cx88_do_ioctl( inode, file, 0, dev->core, cmd, arg, cx88_ioctl_hook );

		return cx88_do_ioctl(inode, file, 0, dev->core, cmd, arg, mpeg_do_ioctl);

	}

	return 0;

}



int (*cx88_ioctl_hook)(struct inode *inode, struct file *file,

			unsigned int cmd, void *arg);

unsigned int (*cx88_ioctl_translator)(unsigned int cmd);



static unsigned int mpeg_translate_ioctl(unsigned int cmd)

{

	return cmd;
@@ -872,8 +868,8 @@ static unsigned int mpeg_translate_ioctl(unsigned int cmd) 
static int mpeg_ioctl(struct inode *inode, struct file *file,

			unsigned int cmd, unsigned long arg)

{

	cmd = cx88_ioctl_translator( cmd );

	return video_usercopy(inode, file, cmd, arg, cx88_ioctl_hook);

	cmd = mpeg_translate_ioctl( cmd );

	return video_usercopy(inode, file, cmd, arg, mpeg_do_ioctl);

}



static int mpeg_open(struct inode *inode, struct file *file)
@@ -1119,8 +1115,6 @@ static int blackbird_init(void) 
	printk(KERN_INFO "cx2388x: snapshot date %04d-%02d-%02d\n",

	       SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100);

#endif

	cx88_ioctl_hook = mpeg_do_ioctl;

	cx88_ioctl_translator = mpeg_translate_ioctl;

	return pci_register_driver(&blackbird_pci_driver);

}
@@ -1132,9 +1126,6 @@ static void blackbird_fini(void) 
module_init(blackbird_init);

module_exit(blackbird_fini);



EXPORT_SYMBOL(cx88_ioctl_hook);

EXPORT_SYMBOL(cx88_ioctl_translator);



/* ----------------------------------------------------------- */

/*

 * Local variables:

drivers/media/video/cx88/cx88-cards.c

+0 −5
Original line number Diff line number Diff line
@@ -1700,11 +1700,6 @@ void cx88_card_setup(struct cx88_core *core) 
/* ------------------------------------------------------------------ */



EXPORT_SYMBOL(cx88_boards);

EXPORT_SYMBOL(cx88_bcount);

EXPORT_SYMBOL(cx88_subids);

EXPORT_SYMBOL(cx88_idcount);

EXPORT_SYMBOL(cx88_card_list);

EXPORT_SYMBOL(cx88_card_setup);



/*

 * Local variables:

drivers/media/video/cx88/cx88-core.c

+0 −2
Original line number Diff line number Diff line
@@ -1181,8 +1181,6 @@ EXPORT_SYMBOL(cx88_set_scale); 
EXPORT_SYMBOL(cx88_vdev_init);

EXPORT_SYMBOL(cx88_core_get);

EXPORT_SYMBOL(cx88_core_put);

EXPORT_SYMBOL(cx88_start_audio_dma);

EXPORT_SYMBOL(cx88_stop_audio_dma);



/*

 * Local variables:

drivers/media/video/cx88/cx88-i2c.c

+0 −1
Original line number Diff line number Diff line
@@ -234,7 +234,6 @@ int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci) 
/* ----------------------------------------------------------------------- */



EXPORT_SYMBOL(cx88_call_i2c_clients);

EXPORT_SYMBOL(cx88_i2c_init);



/*

 * Local variables:

drivers/media/video/cx88/cx88-tvaudio.c

+1 −1
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ static void set_audio_standard_FM(struct cx88_core *core, 


/* ----------------------------------------------------------- */



int cx88_detect_nicam(struct cx88_core *core)

static int cx88_detect_nicam(struct cx88_core *core)

{

	int i, j = 0;