Unverified Commit f80beaf6 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: ipc3: Remove the ipc3-ops.h header file 



Only the main IPC ops struct should be visible outside of IPC3 code to make
sure that the code is correctly abstracted.

Instead of keeping the ipc3-ops.h with only the high level ops struct
declaration, put the ipc3_ops to sof-priv.h and move all other ops struct
declaration into ipc3-priv.h

New IPC implementation should follow this route: the main IPC ops should be
declared in sof-priv.h and no other IPC version related header be used
for generic code.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20220504102831.10071-1-peter.ujfalusi@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c0b38be1

sound/soc/sof/ipc.c

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include "sof-priv.h"

#include "sof-audio.h"

#include "ops.h"

#include "ipc3-ops.h"



/**

 * sof_ipc_send_msg - generic function to prepare and send one IPC message

sound/soc/sof/ipc3-control.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 


#include "sof-priv.h"

#include "sof-audio.h"

#include "ipc3-ops.h"

#include "ipc3-priv.h"



/* IPC set()/get() for kcontrols. */

static int sof_ipc3_set_get_kcontrol_data(struct snd_sof_control *scontrol, bool set)

sound/soc/sof/ipc3-loader.c

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include "sof-priv.h"

#include "sof-audio.h"

#include "ipc3-priv.h"

#include "ipc3-ops.h"

#include "ops.h"



static int ipc3_fw_ext_man_get_version(struct snd_sof_dev *sdev,

sound/soc/sof/ipc3-ops.h

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */

/*

 * This file is provided under a dual BSD/GPLv2 license.  When using or

 * redistributing this file, you may do so under either license.

 *

 * Copyright(c) 2021 Intel Corporation. All rights reserved.

 *

 * Author: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

 */



#ifndef __SOUND_SOC_SOF_IPC3_OPS_H

#define __SOUND_SOC_SOF_IPC3_OPS_H



#include "sof-priv.h"



extern const struct sof_ipc_tplg_ops ipc3_tplg_ops;

extern const struct sof_ipc_ops ipc3_ops;

extern const struct sof_ipc_tplg_control_ops tplg_ipc3_control_ops;

extern const struct sof_ipc_pcm_ops ipc3_pcm_ops;



#endif

sound/soc/sof/ipc3-pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
//



#include <sound/pcm_params.h>

#include "ipc3-ops.h"

#include "ipc3-priv.h"

#include "ops.h"

#include "sof-priv.h"

#include "sof-audio.h"