Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/remove bool #270

Merged
merged 2 commits into from
Nov 14, 2018
Merged

Fix/remove bool #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1e0ca3
ASoC: SOF: ipc: fix use of 'complete'
plbossart Nov 12, 2018
3768436
ASoC: SOF: remove boolean use in structures
plbossart Nov 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sound/soc/sof/intel/hda.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ struct sof_intel_hda_dev {
struct hdac_ext_stream *dtrace_stream;

/* if position update IPC needed */
bool no_ipc_position;
u32 no_ipc_position;

int irq;

Expand Down
8 changes: 4 additions & 4 deletions sound/soc/sof/ipc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ struct snd_sof_ipc {
/* TX message work and status */
wait_queue_head_t wait_txq;
struct work_struct tx_kwork;
bool msg_pending;
u32 msg_pending;

/* Rx Message work and status */
struct work_struct rx_kwork;
Expand Down Expand Up @@ -218,7 +218,7 @@ static int tx_wait_done(struct snd_sof_ipc *ipc, struct snd_sof_ipc_msg *msg,
int ret;

/* wait for DSP IPC completion */
ret = wait_event_timeout(msg->waitq, msg->complete,
ret = wait_event_timeout(msg->waitq, msg->ipc_complete,
msecs_to_jiffies(IPC_TIMEOUT_MSECS));

spin_lock_irqsave(&sdev->ipc_lock, flags);
Expand Down Expand Up @@ -275,7 +275,7 @@ int sof_ipc_tx_message(struct snd_sof_ipc *ipc, u32 header,
msg->header = header;
msg->msg_size = msg_bytes;
msg->reply_size = reply_bytes;
msg->complete = false;
msg->ipc_complete = false;

/* attach any data */
if (msg_bytes)
Expand Down Expand Up @@ -347,7 +347,7 @@ static struct snd_sof_ipc_msg *sof_ipc_reply_find_msg(struct snd_sof_ipc *ipc,
static void sof_ipc_tx_msg_reply_complete(struct snd_sof_ipc *ipc,
struct snd_sof_ipc_msg *msg)
{
msg->complete = true;
msg->ipc_complete = true;
wake_up(&msg->waitq);
}

Expand Down
12 changes: 6 additions & 6 deletions sound/soc/sof/sof-priv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ struct snd_sof_ipc_msg {
size_t reply_size;

wait_queue_head_t waitq;
bool complete;
u32 ipc_complete;
};

/* PCM stream, mapped to FW component */
Expand Down Expand Up @@ -317,7 +317,7 @@ struct snd_sof_dev {

/* DSP firmware boot */
wait_queue_head_t boot_wait;
bool boot_complete;
u32 boot_complete;

/* DSP HW differentiation */
struct snd_sof_pdata *pdata;
Expand Down Expand Up @@ -377,12 +377,12 @@ struct snd_sof_dev {
int dma_trace_pages;
wait_queue_head_t trace_sleep;
u32 host_offset;
bool dtrace_is_enabled;
bool dtrace_error;
u32 dtrace_is_enabled;
u32 dtrace_error;

/* PM */
bool restore_kcontrols; /* restore kcontrols upon resume */
bool first_boot;
u32 restore_kcontrols; /* restore kcontrols upon resume */
u32 first_boot;

void *private; /* core does not touch this */
};
Expand Down