1 files changed, 61 insertions, 55 deletions

diff --git a/configfs.c b/configfs.c
index 1a7e7c5..12e95a5 100644
--- a/configfs.c
+++ b/configfs.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0
-/* 
+/*
  * AVIRT - ALSA Virtual Soundcard
  *
  * Copyright (c) 2010-2018 Fiberdyne Systems Pty Ltd
- * 
+ *
  * configfs.c - AVIRT configfs support
  */
 
@@ -17,54 +17,61 @@
 #define D_PRINTK(fmt, args...) DDEBUG(D_LOGNAME, fmt, ##args)
 #define D_ERRORK(fmt, args...) DERROR(D_LOGNAME, fmt, ##args)
 
-static ssize_t cfg_avirt_stream_direction_show(struct config_item *item,
-					       char *page)
+static ssize_t cfg_snd_avirt_stream_direction_show(struct config_item *item,
+						   char *page)
 {
 	ssize_t count;
-	struct avirt_stream *stream = avirt_stream_from_config_item(item);
+	struct snd_avirt_stream *stream =
+		snd_avirt_stream_from_config_item(item);
 
 	count = sprintf(page, "%d\n", stream->direction);
 
 	return count;
 }
-CONFIGFS_ATTR_RO(cfg_avirt_stream_, direction);
+CONFIGFS_ATTR_RO(cfg_snd_avirt_stream_, direction);
 
-static ssize_t cfg_avirt_stream_map_show(struct config_item *item, char *page)
+static ssize_t cfg_snd_avirt_stream_map_show(struct config_item *item,
+					     char *page)
 {
-	struct avirt_stream *stream = avirt_stream_from_config_item(item);
+	struct snd_avirt_stream *stream =
+		snd_avirt_stream_from_config_item(item);
 
 	return sprintf(page, "%s\n", stream->map);
 }
 
-static ssize_t cfg_avirt_stream_map_store(struct config_item *item,
-					  const char *page, size_t count)
+static ssize_t cfg_snd_avirt_stream_map_store(struct config_item *item,
+					      const char *page, size_t count)
 {
 	char *split;
-	struct avirt_stream *stream = avirt_stream_from_config_item(item);
+	struct snd_avirt_stream *stream =
+		snd_avirt_stream_from_config_item(item);
 
 	split = strsep((char **)&page, "\n");
 	memcpy(stream->map, (char *)split, count);
 
 	return count;
 }
-CONFIGFS_ATTR(cfg_avirt_stream_, map);
+CONFIGFS_ATTR(cfg_snd_avirt_stream_, map);
 
-static ssize_t cfg_avirt_stream_channels_show(struct config_item *item,
-					      char *page)
+static ssize_t cfg_snd_avirt_stream_channels_show(struct config_item *item,
+						  char *page)
 {
 	ssize_t count;
-	struct avirt_stream *stream = avirt_stream_from_config_item(item);
+	struct snd_avirt_stream *stream =
+		snd_avirt_stream_from_config_item(item);
 
 	count = sprintf(page, "%d\n", stream->channels);
 
 	return count;
 }
 
-static ssize_t cfg_avirt_stream_channels_store(struct config_item *item,
-					       const char *page, size_t count)
+static ssize_t cfg_snd_avirt_stream_channels_store(struct config_item *item,
+						   const char *page,
+						   size_t count)
 {
 	int err;
-	struct avirt_stream *stream = avirt_stream_from_config_item(item);
+	struct snd_avirt_stream *stream =
+		snd_avirt_stream_from_config_item(item);
 	unsigned long tmp;
 	char *p = (char *)page;
 
@@ -79,37 +86,37 @@ static ssize_t cfg_avirt_stream_channels_store(struct config_item *item,
 
 	return count;
 }
-CONFIGFS_ATTR(cfg_avirt_stream_, channels);
+CONFIGFS_ATTR(cfg_snd_avirt_stream_, channels);
 
-static struct configfs_attribute *cfg_avirt_stream_attrs[] = {
-	&cfg_avirt_stream_attr_channels,
-	&cfg_avirt_stream_attr_map,
-	&cfg_avirt_stream_attr_direction,
+static struct configfs_attribute *cfg_snd_avirt_stream_attrs[] = {
+	&cfg_snd_avirt_stream_attr_channels,
+	&cfg_snd_avirt_stream_attr_map,
+	&cfg_snd_avirt_stream_attr_direction,
 	NULL,
 };
 
-static void cfg_avirt_stream_release(struct config_item *item)
+static void cfg_snd_avirt_stream_release(struct config_item *item)
 {
 	D_INFOK("item->name:%s", item->ci_namebuf);
-	kfree(avirt_stream_from_config_item(item));
+	kfree(snd_avirt_stream_from_config_item(item));
 }
 
-static struct configfs_item_operations cfg_avirt_stream_ops = {
-	.release = cfg_avirt_stream_release,
+static struct configfs_item_operations cfg_snd_avirt_stream_ops = {
+	.release = cfg_snd_avirt_stream_release,
 };
 
-static struct config_item_type cfg_avirt_stream_type = {
-	.ct_item_ops = &cfg_avirt_stream_ops,
-	.ct_attrs = cfg_avirt_stream_attrs,
+static struct config_item_type cfg_snd_avirt_stream_type = {
+	.ct_item_ops = &cfg_snd_avirt_stream_ops,
+	.ct_attrs = cfg_snd_avirt_stream_attrs,
 	.ct_owner = THIS_MODULE,
 };
 
 static struct config_item *
-	cfg_avirt_stream_make_item(struct config_group *group, const char *name)
+cfg_snd_avirt_stream_make_item(struct config_group *group, const char *name)
 {
 	char *split;
 	int direction;
-	struct avirt_stream *stream;
+	struct snd_avirt_stream *stream;
 
 	// Get prefix (playback_ or capture_)
 	split = strsep((char **)&name, "_");
@@ -130,24 +137,25 @@ static struct config_item *
 
 	// Get stream name, and create PCM for stream
 	split = strsep((char **)&name, "\n");
-	stream = __avirt_stream_create(split, direction);
+	stream = snd_avirt_stream_create(split, direction);
 	if (IS_ERR(stream))
 		return ERR_PTR(PTR_ERR(stream));
 
-	config_item_init_type_name(&stream->item, name, &cfg_avirt_stream_type);
+	config_item_init_type_name(&stream->item, name,
+				   &cfg_snd_avirt_stream_type);
 
 	return &stream->item;
 }
 
-static ssize_t cfg_avirt_stream_group_sealed_show(struct config_item *item,
-						  char *page)
+static ssize_t cfg_snd_avirt_stream_group_sealed_show(struct config_item *item,
+						      char *page)
 {
-	return snprintf(page, PAGE_SIZE, "%d\n", __avirt_streams_sealed());
+	return snprintf(page, PAGE_SIZE, "%d\n", snd_avirt_streams_sealed());
 }
 
-static ssize_t cfg_avirt_stream_group_sealed_store(struct config_item *item,
-						   const char *page,
-						   size_t count)
+static ssize_t cfg_snd_avirt_stream_group_sealed_store(struct config_item *item,
+						       const char *page,
+						       size_t count)
 {
 	unsigned long tmp;
 	char *p = (char *)page;
@@ -159,24 +167,24 @@ static ssize_t cfg_avirt_stream_group_sealed_store(struct config_item *item,
 		return -ERANGE;
 	}
 
-	__avirt_streams_seal();
+	snd_avirt_streams_seal();
 
 	return count;
 }
-CONFIGFS_ATTR(cfg_avirt_stream_group_, sealed);
+CONFIGFS_ATTR(cfg_snd_avirt_stream_group_, sealed);
 
-static struct configfs_attribute *cfg_avirt_stream_group_attrs[] = {
-	&cfg_avirt_stream_group_attr_sealed,
+static struct configfs_attribute *cfg_snd_avirt_stream_group_attrs[] = {
+	&cfg_snd_avirt_stream_group_attr_sealed,
 	NULL,
 };
 
-static struct configfs_group_operations cfg_avirt_stream_group_ops = {
-	.make_item = cfg_avirt_stream_make_item
+static struct configfs_group_operations cfg_snd_avirt_stream_group_ops = {
+	.make_item = cfg_snd_avirt_stream_make_item
 };
 
 static struct config_item_type cfg_stream_group_type = {
-	.ct_group_ops = &cfg_avirt_stream_group_ops,
-	.ct_attrs = cfg_avirt_stream_group_attrs,
+	.ct_group_ops = &cfg_snd_avirt_stream_group_ops,
+	.ct_attrs = cfg_snd_avirt_stream_group_attrs,
 	.ct_owner = THIS_MODULE
 };
 
@@ -185,17 +193,15 @@ static struct config_item_type cfg_avirt_group_type = {
 };
 
 static struct configfs_subsystem cfg_subsys = {
-	.su_group =
-		{
-			.cg_item =
-				{
-					.ci_namebuf = "avirt",
+	.su_group = {
+			.cg_item = {
+					.ci_namebuf = "snd-avirt",
 					.ci_type = &cfg_avirt_group_type,
 				},
 		},
 };
 
-int __init __avirt_configfs_init(struct avirt_core *core)
+int __init snd_avirt_configfs_init(struct snd_avirt_core *core)
 {
 	int err;
 
@@ -222,7 +228,7 @@ exit_configfs:
 	return err;
 }
 
-void __exit __avirt_configfs_exit(struct avirt_core *core)
+void __exit snd_avirt_configfs_exit(struct snd_avirt_core *core)
 {
 	configfs_unregister_default_group(core->stream_group);
 	configfs_unregister_subsystem(&cfg_subsys);