diff options
| author | Steven Toth <stoth@kernellabs.com> | 2011-10-10 16:09:53 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-10-14 22:03:30 +0200 |
| commit | efa762f597cb6ec094a9e62acd4f1167b3199d34 (patch) | |
| tree | 4f97c84d23508083de1196e71ca4d36b02100c77 /drivers/media/video/cx23885 | |
| parent | [media] cx23885: convert call clients into subdevices (diff) | |
| download | linux-efa762f597cb6ec094a9e62acd4f1167b3199d34.tar.xz linux-efa762f597cb6ec094a9e62acd4f1167b3199d34.zip | |
[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/media/video/cx23885')
| -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, * 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; 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) } 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); 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); /* ----------------------------------------------------------- */ /* 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, |