Refactor top-level AVIRT API to be avirt_<subject>_<action>

This makes for a more organized function/variable naming convention

Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>

4 files changed, 17 insertions, 17 deletions

diff --git a/alsa-pcm.c b/alsa-pcm.c
index d65809c..798f76c 100644
--- a/alsa-pcm.c
+++ b/alsa-pcm.c
@@ -68,7 +68,7 @@ static int pcm_open(struct snd_pcm_substream *substream)
 	unsigned int bytes_per_sample = 0, blocksize = 0, chans = 0;
 
 	char *uid = "ap_fddsp"; // TD MF: Make this dynamic!
-	audiopath = avirt_get_audiopath(uid);
+	audiopath = avirt_audiopath_get(uid);
 	CHK_NULL_V(audiopath, "Cannot find Audio Path uid: '%s'!", uid);
 	substream->private_data = audiopath;
 
diff --git a/core.c b/core.c
index c9e8d25..e1afce8 100644
--- a/core.c
+++ b/core.c
@@ -343,11 +343,11 @@ static void destroy_avirt_audiopath_obj(struct avirt_audiopath_obj *p)
 }
 
 /**
- * avirt_get_audiopath - retrieves the Audio Path by its UID
+ * avirt_audiopath_get - retrieves the Audio Path by its UID
  * @uid: Unique ID for the Audio Path
  * @return: Corresponding Audio Path
  */
-struct avirt_audiopath *avirt_get_audiopath(const char *uid)
+struct avirt_audiopath *avirt_audiopath_get(const char *uid)
 {
 	struct avirt_audiopath_obj *ap_obj;
 	list_for_each_entry (ap_obj, &audiopath_list, list) {
@@ -360,12 +360,12 @@ struct avirt_audiopath *avirt_get_audiopath(const char *uid)
 }
 
 /**
- * avirt_register_audiopath - register Audio Path with ALSA virtual driver
+ * avirt_audiopath_register - register Audio Path with ALSA virtual driver
  * @audiopath: Audio Path to be registered
  * @core: ALSA virtual driver core info
  * @return: 0 on success or error code otherwise
  */
-int avirt_register_audiopath(struct avirt_audiopath *audiopath,
+int avirt_audiopath_register(struct avirt_audiopath *audiopath,
 			     struct avirt_coreinfo **info)
 {
 	struct avirt_audiopath_obj *audiopath_obj;
@@ -392,14 +392,14 @@ int avirt_register_audiopath(struct avirt_audiopath *audiopath,
 
 	return 0;
 }
-EXPORT_SYMBOL_GPL(avirt_register_audiopath);
+EXPORT_SYMBOL_GPL(avirt_audiopath_register);
 
 /**
- * avirt_deregister_audiopath - deregister Audio Path with ALSA virtual driver
+ * avirt_audiopath_deregister - deregister Audio Path with ALSA virtual driver
  * @audiopath: Audio Path to be deregistered
  * @return: 0 on success or error code otherwise
  */
-int avirt_deregister_audiopath(struct avirt_audiopath *audiopath)
+int avirt_audiopath_deregister(struct avirt_audiopath *audiopath)
 {
 	struct avirt_audiopath_obj *audiopath_obj;
 
@@ -421,7 +421,7 @@ int avirt_deregister_audiopath(struct avirt_audiopath *audiopath)
 
 	return 0;
 }
-EXPORT_SYMBOL_GPL(avirt_deregister_audiopath);
+EXPORT_SYMBOL_GPL(avirt_audiopath_deregister);
 
 /**
  * avirt_unregister_all - Unregister the platform device driver
diff --git a/core.h b/core.h
index 4a0157a..c11ee1d 100644
--- a/core.h
+++ b/core.h
@@ -67,27 +67,27 @@ struct avirt_coreinfo {
 };
 
 /**
- * avirt_register_audiopath - register Audio Path with ALSA virtual driver
+ * avirt_audiopath_register - register Audio Path with ALSA virtual driver
  * @audiopath: Audio Path to be registered
  * @core: ALSA virtual driver core info
  * @return: 0 on success or error code otherwise
  */
-int avirt_register_audiopath(struct avirt_audiopath *audiopath,
+int avirt_audiopath_register(struct avirt_audiopath *audiopath,
 			     struct avirt_coreinfo **coreinfo);
 
 /**
- * avirt_deregister_audiopath - deregister Audio Path with ALSA virtual driver
+ * avirt_audiopath_deregister - deregister Audio Path with ALSA virtual driver
  * @audiopath: Audio Path to be deregistered
  * @return: 0 on success or error code otherwise
  */
-int avirt_deregister_audiopath(struct avirt_audiopath *audiopath);
+int avirt_audiopath_deregister(struct avirt_audiopath *audiopath);
 
 /**
- * avirt_get_audiopath - retrieves the Audio Path by it's UID
+ * avirt_audiopath_get - retrieves the Audio Path by it's UID
  * @uid: Unique ID for the Audio Path
  * @return: Corresponding Audio Path
  */
-struct avirt_audiopath *avirt_get_audiopath(const char *uid);
+struct avirt_audiopath *avirt_audiopath_get(const char *uid);
 
 /**
  * avirt_subscribe_stream - subscribe the Audio Path to the given streams
diff --git a/dummy/dummy.c b/dummy/dummy.c
index fa9dd41..d619786 100644
--- a/dummy/dummy.c
+++ b/dummy/dummy.c
@@ -258,7 +258,7 @@ static int __init dummy_init(void)
 
 	pr_info("init()\n");
 
-	err = avirt_register_audiopath(&dummyap_module, &coreinfo);
+	err = avirt_audiopath_register(&dummyap_module, &coreinfo);
 	if ((err < 0) || (!coreinfo)) {
 		pr_err("%s: coreinfo is NULL!\n", __func__);
 		return err;
@@ -271,7 +271,7 @@ static void __exit dummy_exit(void)
 {
 	pr_info("exit()\n");
 
-	avirt_deregister_audiopath(&dummyap_module);
+	avirt_audiopath_deregister(&dummyap_module);
 }
 
 module_init(dummy_init);