Skip to content

Commit fff7bd8

Browse files
ujfalusiranj063
ujfalusi
authored and
ranj063
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>
1 parent 842b498 commit fff7bd8

2 files changed

Lines changed: 10 additions & 35 deletions

File tree

‎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

@@ -328,9 +326,8 @@ int mtl_dsp_post_fw_run(struct snd_sof_dev *sdev)
328326
hda_sdw_int_enable(sdev, true);
329327
return 0;
330328
}
331-
EXPORT_SYMBOL_NS(mtl_dsp_post_fw_run, "SND_SOC_SOF_INTEL_MTL");
332329

333-
void mtl_dsp_dump(struct snd_sof_dev *sdev, u32 flags)
330+
static void mtl_dsp_dump(struct snd_sof_dev *sdev, u32 flags)
334331
{
335332
char *level = (flags & SOF_DBG_DUMP_OPTIONAL) ? KERN_DEBUG : KERN_ERR;
336333
u32 fwsts;
@@ -346,7 +343,6 @@ void mtl_dsp_dump(struct snd_sof_dev *sdev, u32 flags)
346343

347344
sof_ipc4_intel_dump_telemetry_state(sdev, flags);
348345
}
349-
EXPORT_SYMBOL_NS(mtl_dsp_dump, "SND_SOC_SOF_INTEL_MTL");
350346

351347
static bool mtl_dsp_primary_core_is_enabled(struct snd_sof_dev *sdev)
352348
{
@@ -562,7 +558,7 @@ int mtl_dsp_cl_init(struct snd_sof_dev *sdev, int stream_tag, bool imr_boot)
562558
}
563559
EXPORT_SYMBOL_NS(mtl_dsp_cl_init, "SND_SOC_SOF_INTEL_MTL");
564560

565-
irqreturn_t mtl_ipc_irq_thread(int irq, void *context)
561+
static irqreturn_t mtl_ipc_irq_thread(int irq, void *context)
566562
{
567563
struct sof_ipc4_msg notification_data = {{ 0 }};
568564
struct snd_sof_dev *sdev = context;
@@ -644,21 +640,18 @@ irqreturn_t mtl_ipc_irq_thread(int irq, void *context)
644640

645641
return IRQ_HANDLED;
646642
}
647-
EXPORT_SYMBOL_NS(mtl_ipc_irq_thread, "SND_SOC_SOF_INTEL_MTL");
648643

649-
int mtl_dsp_ipc_get_mailbox_offset(struct snd_sof_dev *sdev)
644+
static int mtl_dsp_ipc_get_mailbox_offset(struct snd_sof_dev *sdev)
650645
{
651646
return MTL_DSP_MBOX_UPLINK_OFFSET;
652647
}
653-
EXPORT_SYMBOL_NS(mtl_dsp_ipc_get_mailbox_offset, "SND_SOC_SOF_INTEL_MTL");
654648

655-
int mtl_dsp_ipc_get_window_offset(struct snd_sof_dev *sdev, u32 id)
649+
static int mtl_dsp_ipc_get_window_offset(struct snd_sof_dev *sdev, u32 id)
656650
{
657651
return MTL_SRAM_WINDOW_OFFSET(id);
658652
}
659-
EXPORT_SYMBOL_NS(mtl_dsp_ipc_get_window_offset, "SND_SOC_SOF_INTEL_MTL");
660653

661-
void mtl_ipc_dump(struct snd_sof_dev *sdev)
654+
static void mtl_ipc_dump(struct snd_sof_dev *sdev)
662655
{
663656
u32 hipcidr, hipcidd, hipcida, hipctdr, hipctdd, hipctda, hipcctl;
664657

@@ -674,7 +667,6 @@ void mtl_ipc_dump(struct snd_sof_dev *sdev)
674667
"Host IPC initiator: %#x|%#x|%#x, target: %#x|%#x|%#x, ctl: %#x\n",
675668
hipcidr, hipcidd, hipcida, hipctdr, hipctdd, hipctda, hipcctl);
676669
}
677-
EXPORT_SYMBOL_NS(mtl_ipc_dump, "SND_SOC_SOF_INTEL_MTL");
678670

679671
static int mtl_dsp_disable_interrupts(struct snd_sof_dev *sdev)
680672
{
@@ -683,7 +675,7 @@ static int mtl_dsp_disable_interrupts(struct snd_sof_dev *sdev)
683675
return mtl_enable_interrupts(sdev, false);
684676
}
685677

686-
int mtl_dsp_core_get(struct snd_sof_dev *sdev, int core)
678+
static int mtl_dsp_core_get(struct snd_sof_dev *sdev, int core)
687679
{
688680
const struct sof_ipc_pm_ops *pm_ops = sdev->ipc->ops->pm;
689681

@@ -695,9 +687,8 @@ int mtl_dsp_core_get(struct snd_sof_dev *sdev, int core)
695687

696688
return 0;
697689
}
698-
EXPORT_SYMBOL_NS(mtl_dsp_core_get, "SND_SOC_SOF_INTEL_MTL");
699690

700-
int mtl_dsp_core_put(struct snd_sof_dev *sdev, int core)
691+
static int mtl_dsp_core_put(struct snd_sof_dev *sdev, int core)
701692
{
702693
const struct sof_ipc_pm_ops *pm_ops = sdev->ipc->ops->pm;
703694
int ret;
@@ -713,7 +704,6 @@ int mtl_dsp_core_put(struct snd_sof_dev *sdev, int core)
713704

714705
return 0;
715706
}
716-
EXPORT_SYMBOL_NS(mtl_dsp_core_put, "SND_SOC_SOF_INTEL_MTL");
717707

718708
int sof_mtl_set_ops(struct snd_sof_dev *sdev, struct snd_sof_dsp_ops *dsp_ops)
719709
{

‎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)