diff options
author | Steven Toth <stoth@kernellabs.com> | 2011-10-10 10:09:53 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-10-14 16:03:30 -0400 |
commit | efa762f597cb6ec094a9e62acd4f1167b3199d34 (patch) | |
tree | 4f97c84d23508083de1196e71ca4d36b02100c77 /drivers | |
parent | 80f1e086e68f4e6ef066022d8b7f5ea0bd686220 (diff) |
[media] cx23885: minor function renaming to ensure uniformity
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/cx23885/cx23885-alsa.c | 4 | ||||
-rw-r--r-- | drivers/media/video/cx23885/cx23885-video.c | 4 | ||||
-rw-r--r-- | drivers/media/video/cx23885/cx23885.h | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/drivers/media/video/cx23885/cx23885-alsa.c b/drivers/media/video/cx23885/cx23885-alsa.c index 31a89b3ac1d0..668776d0e98d 100644 --- a/drivers/media/video/cx23885/cx23885-alsa.c +++ b/drivers/media/video/cx23885/cx23885-alsa.c | |||
@@ -472,7 +472,7 @@ static int snd_cx23885_pcm(struct cx23885_audio_dev *chip, int device, | |||
472 | * Alsa Constructor - Component probe | 472 | * Alsa Constructor - Component probe |
473 | */ | 473 | */ |
474 | 474 | ||
475 | struct cx23885_audio_dev *cx23885_audio_initdev(struct cx23885_dev *dev) | 475 | struct cx23885_audio_dev *cx23885_audio_register(struct cx23885_dev *dev) |
476 | { | 476 | { |
477 | struct snd_card *card; | 477 | struct snd_card *card; |
478 | struct cx23885_audio_dev *chip; | 478 | struct cx23885_audio_dev *chip; |
@@ -527,7 +527,7 @@ error: | |||
527 | /* | 527 | /* |
528 | * ALSA destructor | 528 | * ALSA destructor |
529 | */ | 529 | */ |
530 | void cx23885_audio_finidev(struct cx23885_dev *dev) | 530 | void cx23885_audio_unregister(struct cx23885_dev *dev) |
531 | { | 531 | { |
532 | struct cx23885_audio_dev *chip = dev->audio_dev; | 532 | struct cx23885_audio_dev *chip = dev->audio_dev; |
533 | 533 | ||
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c index 747fdb35145b..58855b2bd4e5 100644 --- a/drivers/media/video/cx23885/cx23885-video.c +++ b/drivers/media/video/cx23885/cx23885-video.c | |||
@@ -1444,7 +1444,7 @@ void cx23885_video_unregister(struct cx23885_dev *dev) | |||
1444 | } | 1444 | } |
1445 | 1445 | ||
1446 | if (dev->audio_dev) | 1446 | if (dev->audio_dev) |
1447 | cx23885_audio_finidev(dev); | 1447 | cx23885_audio_unregister(dev); |
1448 | } | 1448 | } |
1449 | 1449 | ||
1450 | int cx23885_video_register(struct cx23885_dev *dev) | 1450 | int cx23885_video_register(struct cx23885_dev *dev) |
@@ -1525,7 +1525,7 @@ int cx23885_video_register(struct cx23885_dev *dev) | |||
1525 | dev->name, video_device_node_name(dev->video_dev)); | 1525 | dev->name, video_device_node_name(dev->video_dev)); |
1526 | 1526 | ||
1527 | /* Register ALSA audio device */ | 1527 | /* Register ALSA audio device */ |
1528 | dev->audio_dev = cx23885_audio_initdev(dev); | 1528 | dev->audio_dev = cx23885_audio_register(dev); |
1529 | 1529 | ||
1530 | /* initial device configuration */ | 1530 | /* initial device configuration */ |
1531 | mutex_lock(&dev->lock); | 1531 | mutex_lock(&dev->lock); |
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h index abeba7a35cea..892d971361a9 100644 --- a/drivers/media/video/cx23885/cx23885.h +++ b/drivers/media/video/cx23885/cx23885.h | |||
@@ -596,8 +596,9 @@ extern void mc417_gpio_enable(struct cx23885_dev *dev, u32 mask, int asoutput); | |||
596 | 596 | ||
597 | /* ----------------------------------------------------------- */ | 597 | /* ----------------------------------------------------------- */ |
598 | /* cx23885-alsa.c */ | 598 | /* cx23885-alsa.c */ |
599 | extern struct cx23885_audio_dev *cx23885_audio_initdev(struct cx23885_dev *dev); | 599 | extern struct cx23885_audio_dev *cx23885_audio_register( |
600 | extern void cx23885_audio_finidev(struct cx23885_dev *dev); | 600 | struct cx23885_dev *dev); |
601 | extern void cx23885_audio_unregister(struct cx23885_dev *dev); | ||
601 | extern int cx23885_audio_irq(struct cx23885_dev *dev, u32 status, u32 mask); | 602 | extern int cx23885_audio_irq(struct cx23885_dev *dev, u32 status, u32 mask); |
602 | extern int cx23885_risc_databuffer(struct pci_dev *pci, | 603 | extern int cx23885_risc_databuffer(struct pci_dev *pci, |
603 | struct btcx_riscmem *risc, | 604 | struct btcx_riscmem *risc, |