openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: most: sound: remove aim designator 

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.gromm@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Christian Gromm 2017-11-21 15:05:06 +01:00 committed by Greg Kroah-Hartman
parent 11b3348f3b
commit 1f95cf02a3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/most/sound/sound.c
View File

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
/*
* sound.c - Audio Application Interface Module for Mostcore
* sound.c - Sound component for Mostcore
*
* Copyright (C) 2015 Microchip Technology Germany II GmbH & Co. KG
*/
@ -21,7 +21,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
@ -234,7 +234,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;
@ -277,7 +277,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);
@ -304,7 +304,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;
}
@ -719,7 +719,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,
@ -733,7 +733,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)
@ -747,7 +747,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);