This patch removes all 'aim' designators and replaces them with 'comp'. It
is needd because userspace interfacing modules are referred to as
components.
Signed-off-by: Christian Gromm <christian.gr...@microchip.com>
---
drivers/staging/most/sound/sound.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/most/sound/sound.c
b/drivers/staging/most/sound/sound.c
index 85bb024..2c9e6c9 100644
--- a/drivers/staging/most/sound/sound.c
+++ b/drivers/staging/most/sound/sound.c
@@ -1,5 +1,5 @@
/*
- * sound.c - Audio Application Interface Module for Mostcore
+ * sound.c - Sound component for Mostcore
*
* Copyright (C) 2015 Microchip Technology Germany II GmbH & Co. KG
*
@@ -27,7 +27,7 @@
#define DRIVER_NAME "sound"
static struct list_head dev_list;
-static struct core_component audio_aim;
+static struct core_component comp;
/**
* struct channel - private structure to keep channel specific data
@@ -240,7 +240,7 @@ static int playback_thread(void *data)
kthread_should_stop() ||
(channel->is_stream_running &&
(mbo = most_get_mbo(channel->iface, channel->id,
- &audio_aim))));
+ &comp))));
if (!mbo)
continue;
@@ -283,7 +283,7 @@ static int pcm_open(struct snd_pcm_substream *substream)
}
}
- if (most_start_channel(channel->iface, channel->id, &audio_aim)) {
+ if (most_start_channel(channel->iface, channel->id, &comp)) {
pr_err("most_start_channel() failed!\n");
if (cfg->direction == MOST_CH_TX)
kthread_stop(channel->playback_task);
@@ -310,7 +310,7 @@ static int pcm_close(struct snd_pcm_substream *substream)
if (channel->cfg->direction == MOST_CH_TX)
kthread_stop(channel->playback_task);
- most_stop_channel(channel->iface, channel->id, &audio_aim);
+ most_stop_channel(channel->iface, channel->id, &comp);
return 0;
}
@@ -725,7 +725,7 @@ static int audio_tx_completion(struct most_interface
*iface, int channel_id)
/**
* Initialization of the struct core_component
*/
-static struct core_component audio_aim = {
+static struct core_component comp = {
.name = DRIVER_NAME,
.probe_channel = audio_probe_channel,
.disconnect_channel = audio_disconnect_channel,
@@ -739,7 +739,7 @@ static int __init audio_init(void)
INIT_LIST_HEAD(&dev_list);
- return most_register_component(&audio_aim);
+ return most_register_component(&comp);
}
static void __exit audio_exit(void)
@@ -753,7 +753,7 @@ static void __exit audio_exit(void)
snd_card_free(channel->card);
}
- most_deregister_component(&audio_aim);
+ most_deregister_component(&comp);
}
module_init(audio_init);
--
2.7.4
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
