Skip to content

Commit 8041622

Browse files
ujfalusibroonie
ujfalusi
authored and
broonie
committed
ASoC: SOF: Intel: mtl: Stop exporting dsp_ops callback functions
There is no need to export individual dsp_ops functions anymore as the callbacks are filled now by sof_mtl_set_ops() Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> Link: https://patch.msgid.link/20250307112816.1495-4-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 0d2d276 commit 8041622

File tree

2 files changed

+10
-35
lines changed

2 files changed

+10
-35
lines changed

‎sound/soc/sof/intel/mtl.c‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ static bool mtl_dsp_check_sdw_irq(struct snd_sof_dev *sdev)
9696
return false;
9797
}
9898

99-
int mtl_ipc_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg)
99+
static int mtl_ipc_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg)
100100
{
101101
struct sof_intel_hda_dev *hdev = sdev->pdata->hw_pdata;
102102
struct sof_ipc4_msg *msg_data = msg->msg_data;
@@ -122,7 +122,6 @@ int mtl_ipc_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg)
122122

123123
return 0;
124124
}
125-
EXPORT_SYMBOL_NS(mtl_ipc_send_msg, "SND_SOC_SOF_INTEL_MTL");
126125

127126
void mtl_enable_ipc_interrupts(struct snd_sof_dev *sdev)
128127
{
@@ -238,7 +237,7 @@ int mtl_enable_interrupts(struct snd_sof_dev *sdev, bool enable)
238237
EXPORT_SYMBOL_NS(mtl_enable_interrupts, "SND_SOC_SOF_INTEL_MTL");
239238

240239
/* pre fw run operations */
241-
int mtl_dsp_pre_fw_run(struct snd_sof_dev *sdev)
240+
static int mtl_dsp_pre_fw_run(struct snd_sof_dev *sdev)
242241
{
243242
struct sof_intel_hda_dev *hdev = sdev->pdata->hw_pdata;
244243
u32 dsphfpwrsts;
@@ -298,9 +297,8 @@ int mtl_dsp_pre_fw_run(struct snd_sof_dev *sdev)
298297

299298
return ret;
300299
}
301-
EXPORT_SYMBOL_NS(mtl_dsp_pre_fw_run, "SND_SOC_SOF_INTEL_MTL");
302300

303-
int mtl_dsp_post_fw_run(struct snd_sof_dev *sdev)
301+
static int mtl_dsp_post_fw_run(struct snd_sof_dev *sdev)
304302
{
305303
int ret;
306304

@@ -325,9 +323,8 @@ int mtl_dsp_post_fw_run(struct snd_sof_dev *sdev)
325323
hda_sdw_int_enable(sdev, true);
326324
return 0;
327325
}
328-
EXPORT_SYMBOL_NS(mtl_dsp_post_fw_run, "SND_SOC_SOF_INTEL_MTL");
329326

330-
void mtl_dsp_dump(struct snd_sof_dev *sdev, u32 flags)
327+
static void mtl_dsp_dump(struct snd_sof_dev *sdev, u32 flags)
331328
{
332329
char *level = (flags & SOF_DBG_DUMP_OPTIONAL) ? KERN_DEBUG : KERN_ERR;
333330
u32 fwsts;
@@ -343,7 +340,6 @@ void mtl_dsp_dump(struct snd_sof_dev *sdev, u32 flags)
343340

344341
sof_ipc4_intel_dump_telemetry_state(sdev, flags);
345342
}
346-
EXPORT_SYMBOL_NS(mtl_dsp_dump, "SND_SOC_SOF_INTEL_MTL");
347343

348344
static bool mtl_dsp_primary_core_is_enabled(struct snd_sof_dev *sdev)
349345
{
@@ -559,7 +555,7 @@ int mtl_dsp_cl_init(struct snd_sof_dev *sdev, int stream_tag, bool imr_boot)
559555
}
560556
EXPORT_SYMBOL_NS(mtl_dsp_cl_init, "SND_SOC_SOF_INTEL_MTL");
561557

562-
irqreturn_t mtl_ipc_irq_thread(int irq, void *context)
558+
static irqreturn_t mtl_ipc_irq_thread(int irq, void *context)
563559
{
564560
struct sof_ipc4_msg notification_data = {{ 0 }};
565561
struct snd_sof_dev *sdev = context;
@@ -641,21 +637,18 @@ irqreturn_t mtl_ipc_irq_thread(int irq, void *context)
641637

642638
return IRQ_HANDLED;
643639
}
644-
EXPORT_SYMBOL_NS(mtl_ipc_irq_thread, "SND_SOC_SOF_INTEL_MTL");
645640

646-
int mtl_dsp_ipc_get_mailbox_offset(struct snd_sof_dev *sdev)
641+
static int mtl_dsp_ipc_get_mailbox_offset(struct snd_sof_dev *sdev)
647642
{
648643
return MTL_DSP_MBOX_UPLINK_OFFSET;
649644
}
650-
EXPORT_SYMBOL_NS(mtl_dsp_ipc_get_mailbox_offset, "SND_SOC_SOF_INTEL_MTL");
651645

652-
int mtl_dsp_ipc_get_window_offset(struct snd_sof_dev *sdev, u32 id)
646+
static int mtl_dsp_ipc_get_window_offset(struct snd_sof_dev *sdev, u32 id)
653647
{
654648
return MTL_SRAM_WINDOW_OFFSET(id);
655649
}
656-
EXPORT_SYMBOL_NS(mtl_dsp_ipc_get_window_offset, "SND_SOC_SOF_INTEL_MTL");
657650

658-
void mtl_ipc_dump(struct snd_sof_dev *sdev)
651+
static void mtl_ipc_dump(struct snd_sof_dev *sdev)
659652
{
660653
u32 hipcidr, hipcidd, hipcida, hipctdr, hipctdd, hipctda, hipcctl;
661654

@@ -671,7 +664,6 @@ void mtl_ipc_dump(struct snd_sof_dev *sdev)
671664
"Host IPC initiator: %#x|%#x|%#x, target: %#x|%#x|%#x, ctl: %#x\n",
672665
hipcidr, hipcidd, hipcida, hipctdr, hipctdd, hipctda, hipcctl);
673666
}
674-
EXPORT_SYMBOL_NS(mtl_ipc_dump, "SND_SOC_SOF_INTEL_MTL");
675667

676668
static int mtl_dsp_disable_interrupts(struct snd_sof_dev *sdev)
677669
{
@@ -680,7 +672,7 @@ static int mtl_dsp_disable_interrupts(struct snd_sof_dev *sdev)
680672
return mtl_enable_interrupts(sdev, false);
681673
}
682674

683-
int mtl_dsp_core_get(struct snd_sof_dev *sdev, int core)
675+
static int mtl_dsp_core_get(struct snd_sof_dev *sdev, int core)
684676
{
685677
const struct sof_ipc_pm_ops *pm_ops = sdev->ipc->ops->pm;
686678

@@ -692,9 +684,8 @@ int mtl_dsp_core_get(struct snd_sof_dev *sdev, int core)
692684

693685
return 0;
694686
}
695-
EXPORT_SYMBOL_NS(mtl_dsp_core_get, "SND_SOC_SOF_INTEL_MTL");
696687

697-
int mtl_dsp_core_put(struct snd_sof_dev *sdev, int core)
688+
static int mtl_dsp_core_put(struct snd_sof_dev *sdev, int core)
698689
{
699690
const struct sof_ipc_pm_ops *pm_ops = sdev->ipc->ops->pm;
700691
int ret;
@@ -710,7 +701,6 @@ int mtl_dsp_core_put(struct snd_sof_dev *sdev, int core)
710701

711702
return 0;
712703
}
713-
EXPORT_SYMBOL_NS(mtl_dsp_core_put, "SND_SOC_SOF_INTEL_MTL");
714704

715705
int sof_mtl_set_ops(struct snd_sof_dev *sdev, struct snd_sof_dsp_ops *dsp_ops)
716706
{

‎sound/soc/sof/intel/mtl.h‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -122,28 +122,13 @@
122122
#define MTL_DSP_REG_HfIMRIS1_IU_MASK BIT(0)
123123

124124
bool mtl_dsp_check_ipc_irq(struct snd_sof_dev *sdev);
125-
int mtl_ipc_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg);
126125

127126
void mtl_enable_ipc_interrupts(struct snd_sof_dev *sdev);
128127
void mtl_disable_ipc_interrupts(struct snd_sof_dev *sdev);
129128

130129
int mtl_enable_interrupts(struct snd_sof_dev *sdev, bool enable);
131130

132-
int mtl_dsp_pre_fw_run(struct snd_sof_dev *sdev);
133-
int mtl_dsp_post_fw_run(struct snd_sof_dev *sdev);
134-
void mtl_dsp_dump(struct snd_sof_dev *sdev, u32 flags);
135-
136131
int mtl_power_down_dsp(struct snd_sof_dev *sdev);
137132
int mtl_dsp_cl_init(struct snd_sof_dev *sdev, int stream_tag, bool imr_boot);
138133

139-
irqreturn_t mtl_ipc_irq_thread(int irq, void *context);
140-
141-
int mtl_dsp_ipc_get_mailbox_offset(struct snd_sof_dev *sdev);
142-
int mtl_dsp_ipc_get_window_offset(struct snd_sof_dev *sdev, u32 id);
143-
144-
void mtl_ipc_dump(struct snd_sof_dev *sdev);
145-
146-
int mtl_dsp_core_get(struct snd_sof_dev *sdev, int core);
147-
int mtl_dsp_core_put(struct snd_sof_dev *sdev, int core);
148-
149134
int sof_mtl_set_ops(struct snd_sof_dev *sdev, struct snd_sof_dsp_ops *dsp_ops);

0 commit comments

Comments
 (0)