Skip to content
Permalink
Browse files
Fixup! ASoC: SOF: IPC: Introduce IPC ops
Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
  • Loading branch information
ujfalusi committed Feb 10, 2022
1 parent 8bf95cb commit dd22c425deaa842639786db96212ac90e94cda8d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
@@ -96,7 +96,7 @@ struct ipc_tplg_control_ops {
};

/**
* struct ipc_tplg_widget_ops - IPC-specific ops for topology widgets
* struct sof_ipc_tplg_widget_ops - IPC-specific ops for topology widgets
* @ipc_setup: Function pointer for setting up widget IPC params
* @ipc_free: Function pointer for freeing widget IPC params
* @token_list: List of token ID's that should be parsed for the widget
@@ -105,7 +105,7 @@ struct ipc_tplg_control_ops {
* @set_up_all_pipelines: Function pointer for setting up all topology pipelines
* @tear_down_all_pipelines: Function pointer for tearing down all topology pipelines
*/
struct ipc_tplg_widget_ops {
struct sof_ipc_tplg_widget_ops {
int (*ipc_setup)(struct snd_sof_widget *swidget);
void (*ipc_free)(struct snd_sof_widget *swidget);
enum sof_tokens *token_list;
@@ -115,7 +115,7 @@ struct ipc_tplg_widget_ops {
};

/**
* struct ipc_tplg_ops - IPC-specific topology ops
* struct sof_ipc_tplg_ops - IPC-specific topology ops
* @widget: Array of pointers to IPC-specific ops for widgets. This should always be of size
* SND_SOF_DAPM_TYPE_COUNT i.e one per widget type. Unsupported widget types will be
* initialized to 0.
@@ -131,8 +131,8 @@ struct ipc_tplg_widget_ops {
* @widget_free: Function pointer for freeing widget in the DSP
* @dai_config: Function pointer for sending DAI config IPC to the DSP
*/
struct ipc_tplg_ops {
const struct ipc_tplg_widget_ops *widget;
struct sof_ipc_tplg_ops {
const struct sof_ipc_tplg_widget_ops *widget;
const struct ipc_tplg_control_ops *control;
int (*route_setup)(struct snd_sof_dev *sdev, struct snd_sof_route *sroute);
const struct sof_token_info *token_list;
@@ -370,11 +370,11 @@ struct ipc_pm_ops {
int (*ctx_restore)(struct snd_sof_dev *sdev);
};

struct ipc_tplg_ops;
struct sof_ipc_tplg_ops;
struct ipc_pcm_ops;

/**
* struct ipc_ops - IPC-specific ops
* struct sof_ipc_ops - IPC-specific ops
* @tplg: Pointer to IPC-specific topology ops
* @pm: Pointer to PM ops
* @pcm: Pointer to PCM ops
@@ -393,8 +393,8 @@ struct ipc_pcm_ops;
* via @set_get_data is a single transfer even if at the hardware level it is
* handled with multiple chunks.
*/
struct ipc_ops {
const struct ipc_tplg_ops *tplg;
struct sof_ipc_ops {
const struct sof_ipc_tplg_ops *tplg;
const struct ipc_pm_ops *pm;
const struct ipc_pcm_ops *pcm;

@@ -421,7 +421,7 @@ struct snd_sof_ipc {
struct snd_sof_ipc_msg msg;

/* IPC ops based on version */
const struct ipc_ops *ops;
const struct sof_ipc_ops *ops;
};

enum sof_dtrace_state {

0 comments on commit dd22c42

Please sign in to comment.