ALSA: x86: Drop unused hdmi_audio_query() (eeb756c5) · Commits · 戴 / test

sound/x86/intel_hdmi_audio.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -146,7 +146,6 @@ struct snd_intelhad {

		int had_event_handler(enum had_event_type event_type, void *data);

		int hdmi_audio_query(void *drv_data, struct hdmi_audio_event event);
		int hdmi_audio_suspend(void *drv_data);
		int hdmi_audio_resume(void *drv_data);
		int hdmi_audio_mode_change(struct snd_pcm_substream *substream);

sound/x86/intel_hdmi_audio_if.c

+0 −54

Original line number	Diff line number	Diff line
		@@ -33,60 +33,6 @@
		#include "intel_hdmi_audio.h"
		#include "intel_hdmi_lpe_audio.h"

		/**
		* hdmi_audio_query - hdmi audio query function
		*
		*@haddata: pointer to HAD private data
		*@event: audio event for which this method is invoked
		*
		* This function is called by client driver to query the
		* hdmi audio.
		*/
		int hdmi_audio_query(void *haddata, struct hdmi_audio_event event)
		{
		struct snd_pcm_substream *substream = NULL;
		struct had_stream_data *had_stream;
		unsigned long flag_irqs;
		struct snd_intelhad intelhaddata = (struct snd_intelhad )haddata;

		if (intelhaddata->stream_info.had_substream)
		substream = intelhaddata->stream_info.had_substream;
		had_stream = &intelhaddata->stream_data;
		switch (event.type) {
		case HAD_EVENT_QUERY_IS_AUDIO_BUSY:
		spin_lock_irqsave(&intelhaddata->had_spinlock, flag_irqs);

		if ((had_stream->stream_type == HAD_RUNNING_STREAM) \|\|
		substream) {
		spin_unlock_irqrestore(&intelhaddata->had_spinlock,
		flag_irqs);
		pr_debug("Audio stream active\n");
		return -EBUSY;
		}
		spin_unlock_irqrestore(&intelhaddata->had_spinlock, flag_irqs);
		break;

		case HAD_EVENT_QUERY_IS_AUDIO_SUSPENDED:
		spin_lock_irqsave(&intelhaddata->had_spinlock, flag_irqs);
		if (intelhaddata->drv_status == HAD_DRV_SUSPENDED) {
		spin_unlock_irqrestore(&intelhaddata->had_spinlock,
		flag_irqs);
		pr_debug("Audio is suspended\n");
		return 1;
		}
		spin_unlock_irqrestore(&intelhaddata->had_spinlock, flag_irqs);
		break;

		default:
		pr_debug("error un-handled event !!\n");
		return -EINVAL;
		break;

		}

		return 0;
		}

		/**
		* hdmi_audio_suspend - power management suspend function
		*

Admin message