iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[media] cx23885: minor function renaming to ensure uniformity

Browse Source 
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Steven Toth 2011-10-10 11:09:53 -03:00 committed by Mauro Carvalho Chehab
parent 80f1e086e6
commit efa762f597
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/video/cx23885/cx23885-alsa.c
View File

@ -472,7 +472,7 @@ static int snd_cx23885_pcm(struct cx23885_audio_dev *chip, int device,
* Alsa Constructor - Component probe
*/
struct cx23885_audio_dev *cx23885_audio_initdev(struct cx23885_dev *dev)
struct cx23885_audio_dev *cx23885_audio_register(struct cx23885_dev *dev)
{
struct snd_card *card;
struct cx23885_audio_dev *chip;
@ -527,7 +527,7 @@ error:
/*
* ALSA destructor
*/
void cx23885_audio_finidev(struct cx23885_dev *dev)
void cx23885_audio_unregister(struct cx23885_dev *dev)
{
struct cx23885_audio_dev *chip = dev->audio_dev;

4
drivers/media/video/cx23885/cx23885-video.c
View File

@ -1444,7 +1444,7 @@ void cx23885_video_unregister(struct cx23885_dev *dev)
}
if (dev->audio_dev)
cx23885_audio_finidev(dev);
cx23885_audio_unregister(dev);
}
int cx23885_video_register(struct cx23885_dev *dev)
@ -1525,7 +1525,7 @@ int cx23885_video_register(struct cx23885_dev *dev)
dev->name, video_device_node_name(dev->video_dev));
/* Register ALSA audio device */
dev->audio_dev = cx23885_audio_initdev(dev);
dev->audio_dev = cx23885_audio_register(dev);
/* initial device configuration */
mutex_lock(&dev->lock);

5
drivers/media/video/cx23885/cx23885.h
View File

@ -596,8 +596,9 @@ extern void mc417_gpio_enable(struct cx23885_dev *dev, u32 mask, int asoutput);
/* ----------------------------------------------------------- */
/* cx23885-alsa.c */
extern struct cx23885_audio_dev *cx23885_audio_initdev(struct cx23885_dev *dev);
extern void cx23885_audio_finidev(struct cx23885_dev *dev);
extern struct cx23885_audio_dev *cx23885_audio_register(
struct cx23885_dev *dev);
extern void cx23885_audio_unregister(struct cx23885_dev *dev);
extern int cx23885_audio_irq(struct cx23885_dev *dev, u32 status, u32 mask);
extern int cx23885_risc_databuffer(struct pci_dev *pci,
struct btcx_riscmem *risc,