summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core.c13
-rw-r--r--core.h1
-rw-r--r--dummy/dummy.c8
-rw-r--r--loopback/loopback.c7
-rw-r--r--sound/avirt.h11
5 files changed, 12 insertions, 28 deletions
diff --git a/core.c b/core.c
index aacc0a1..827ee5c 100644
--- a/core.c
+++ b/core.c
@@ -28,14 +28,11 @@ MODULE_LICENSE("GPL v2");
#define SND_AVIRTUAL_DRIVER "snd_avirt"
static struct snd_avirt_core core = {
+ .version = { 0, 0, 1 },
.stream_count = 0,
.streams_sealed = false,
};
-struct snd_avirt_coreinfo coreinfo = {
- .version = { 0, 0, 1 },
-};
-
static LIST_HEAD(audiopath_list);
struct snd_avirt_audiopath_obj {
@@ -256,11 +253,9 @@ struct snd_avirt_audiopath *snd_avirt_audiopath_get(const char *uid)
/**
* snd_avirt_audiopath_register - register Audio Path with AVIRT
* @audiopath: Audio Path to be registered
- * @core: ALSA virtual driver core info
* @return: 0 on success or error code otherwise
*/
-int snd_avirt_audiopath_register(struct snd_avirt_audiopath *audiopath,
- struct snd_avirt_coreinfo **info)
+int snd_avirt_audiopath_register(struct snd_avirt_audiopath *audiopath)
{
struct snd_avirt_audiopath_obj *audiopath_obj;
@@ -451,8 +446,8 @@ static int __init core_init(void)
{
int err;
- D_INFOK("Alsa Virtual Sound Driver avirt-%d.%d.%d", coreinfo.version[0],
- coreinfo.version[1], coreinfo.version[2]);
+ D_INFOK("Alsa Virtual Sound Driver avirt-%d.%d.%d", core.version[0],
+ core.version[1], core.version[2]);
core.avirt_class = class_create(THIS_MODULE, SND_AVIRTUAL_DRIVER);
if (IS_ERR(core.avirt_class)) {
diff --git a/core.h b/core.h
index 735df65..16f186a 100644
--- a/core.h
+++ b/core.h
@@ -17,6 +17,7 @@
extern struct snd_pcm_ops pcm_ops;
struct snd_avirt_core {
+ int version[3];
struct snd_card *card;
struct device *dev;
struct class *avirt_class;
diff --git a/dummy/dummy.c b/dummy/dummy.c
index 5f19564..7c85531 100644
--- a/dummy/dummy.c
+++ b/dummy/dummy.c
@@ -34,8 +34,6 @@ MODULE_LICENSE("GPL v2");
#define get_dummy_ops(substream) \
(*(const struct dummy_timer_ops **)(substream)->runtime->private_data)
-static struct snd_avirt_coreinfo *coreinfo;
-
/*******************************************************************************
* System Timer Interface
*
@@ -287,9 +285,9 @@ static int __init dummy_init(void)
pr_info("init()\n");
- err = snd_avirt_audiopath_register(&dummyap_module, &coreinfo);
- if ((err < 0) || (!coreinfo)) {
- pr_err("%s: coreinfo is NULL!\n", __func__);
+ err = snd_avirt_audiopath_register(&dummyap_module);
+ if (err < 0) {
+ AP_ERRORK("Failed to register with AVIRT");
return err;
}
diff --git a/loopback/loopback.c b/loopback/loopback.c
index b4a82e5..c3e06be 100644
--- a/loopback/loopback.c
+++ b/loopback/loopback.c
@@ -46,7 +46,6 @@ MODULE_LICENSE("GPL");
#define NO_PITCH 100000
-static struct snd_avirt_coreinfo *coreinfo;
static struct loopback *loopback;
struct loopback_pcm;
@@ -1093,9 +1092,9 @@ static int __init alsa_card_loopback_init(void)
{
int err = 0;
- err = snd_avirt_audiopath_register(&loopbackap_module, &coreinfo);
- if ((err < 0) || (!coreinfo)) {
- AP_ERRORK("coreinfo is NULL!");
+ err = snd_avirt_audiopath_register(&loopbackap_module);
+ if (err < 0) {
+ AP_ERRORK("Failed to register with AVIRT");
return err;
}
diff --git a/sound/avirt.h b/sound/avirt.h
index 1a5c546..b077bbc 100644
--- a/sound/avirt.h
+++ b/sound/avirt.h
@@ -63,20 +63,11 @@ struct snd_avirt_stream {
};
/**
- * AVIRT core info
- */
-struct snd_avirt_coreinfo {
- unsigned int version[3];
-};
-
-/**
* snd_avirt_audiopath_register - register Audio Path with AVIRT
* @audiopath: Audio Path to be registered
- * @core: ALSA virtual driver core info
* @return: 0 on success or error code otherwise
*/
-int snd_avirt_audiopath_register(struct snd_avirt_audiopath *audiopath,
- struct snd_avirt_coreinfo **coreinfo);
+int snd_avirt_audiopath_register(struct snd_avirt_audiopath *audiopath);
/**
* snd_avirt_audiopath_deregister - deregister Audio Path with AVIRT