[media] cx23885: minor function renaming to ensure uniformity

Signed-off-by: NSteven Toth <stoth@kernellabs.com>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>

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 @@ struct cx23885_audio_dev *cx23885_audio_initdev(struct cx23885_dev *dev)
 /*
  * 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;
 

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);

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,