Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03c34377 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: x86: Clean up unused defines and inclusions 



Many defines and constants are left unused.  Clean them up.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 7ceba75f

sound/x86/intel_hdmi_audio.c

+7 −3
Original line number Diff line number Diff line
@@ -21,19 +21,21 @@ 
 * ALSA driver for Intel HDMI audio

 */



#include <linux/types.h>

#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/slab.h>

#include <linux/module.h>

#include <linux/interrupt.h>

#include <linux/acpi.h>

#include <linux/pm_runtime.h>

#include <asm/cacheflush.h>

#include <sound/pcm.h>

#include <sound/core.h>

#include <sound/asoundef.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>

#include <sound/initval.h>

#include <sound/control.h>

#include <sound/initval.h>

#include <drm/drm_edid.h>

#include <drm/intel_lpe_audio.h>

#include "intel_hdmi_audio.h"
@@ -929,6 +931,8 @@ static int snd_intelhad_prog_n(u32 aud_samp_freq, u32 *n_param, 
	return 0;

}



#define MAX_CNT			0xFF



static void snd_intelhad_handle_underrun(struct snd_intelhad *intelhaddata)

{

	u32 hdmi_status = 0, i = 0;

sound/x86/intel_hdmi_audio.h

+1 −10
Original line number Diff line number Diff line
@@ -30,20 +30,11 @@ 
#ifndef _INTEL_HDMI_AUDIO_H_

#define _INTEL_HDMI_AUDIO_H_



#include <linux/types.h>

#include <sound/initval.h>

#include <linux/version.h>

#include <linux/pm_runtime.h>

#include <sound/asoundef.h>

#include <sound/control.h>

#include <sound/pcm.h>

#include <drm/drm_edid.h>

#include "intel_hdmi_lpe_audio.h"



#define PCM_INDEX		0

#define MAX_PB_STREAMS		1

#define MAX_CAP_STREAMS		0

#define HDMI_AUDIO_DRIVER	"hdmi-audio"



#define HDMI_INFO_FRAME_WORD1	0x000a0184

#define DP_INFO_FRAME_WORD1	0x00441b84
@@ -85,7 +76,7 @@ struct ring_buf_info { 
	u8	is_valid;

};



/**

/*

 * struct snd_intelhad - intelhad driver structure

 *

 * @card: ptr to hold card details

sound/x86/intel_hdmi_lpe_audio.h

+12 −56
Original line number Diff line number Diff line
@@ -23,20 +23,6 @@ 
#ifndef __INTEL_HDMI_LPE_AUDIO_H

#define __INTEL_HDMI_LPE_AUDIO_H



#include <linux/types.h>

#include <sound/initval.h>

#include <linux/version.h>

#include <linux/pm_runtime.h>

#include <linux/platform_device.h>

#include <sound/asoundef.h>

#include <sound/control.h>

#include <sound/pcm.h>



#define AUD_CONFIG_VALID_BIT			(1<<9)

#define AUD_CONFIG_DP_MODE			(1<<15)

#define AUD_CONFIG_BLOCK_BIT			(1<<7)



#define HMDI_LPE_AUDIO_DRIVER_NAME		"intel-hdmi-lpe-audio"

#define HAD_MAX_DEVICES		1

#define HAD_MIN_CHANNEL		2

#define HAD_MAX_CHANNEL		8
@@ -96,14 +82,6 @@ 
/* Naud Value */

#define DP_NAUD_VAL					32768



/* _AUD_CONFIG register MASK */

#define AUD_CONFIG_MASK_UNDERRUN	0xC0000000

#define AUD_CONFIG_MASK_SRDBG		0x00000002

#define AUD_CONFIG_MASK_FUNCRST		0x00000001



#define MAX_CNT			0xFF

#define HAD_SUSPEND_DELAY	1000



enum had_drv_status {

	HAD_DRV_CONNECTED,

	HAD_DRV_RUNNING,
@@ -120,13 +98,6 @@ enum intel_had_aud_buf_type { 
	HAD_BUF_TYPE_D = 3,

};



enum num_aud_ch {

	CH_STEREO = 0,

	CH_THREE_FOUR = 1,

	CH_FIVE_SIX = 2,

	CH_SEVEN_EIGHT = 3

};



/* HDMI Controller register offsets - audio domain common */

/* Base address for below regs = 0x65000 */

enum hdmi_ctrl_reg_offset_common {
@@ -220,6 +191,10 @@ union aud_cfg { 
	u32 regval;

};



#define AUD_CONFIG_BLOCK_BIT			(1 << 7)

#define AUD_CONFIG_VALID_BIT			(1 << 9)

#define AUD_CONFIG_DP_MODE			(1 << 15)



/* Audio Channel Status 0 Attributes */

union aud_ch_status_0 {

	struct {
@@ -371,32 +346,13 @@ union aud_info_frame3 { 
	u32 regval;

};



#define HDMI_AUDIO_UNDERRUN     (1UL<<31)

#define HDMI_AUDIO_BUFFER_DONE  (1UL<<29)





#define PORT_ENABLE			(1 << 31)

#define SDVO_AUDIO_ENABLE	(1 << 6)

/* AUD_HDMI_STATUS bits */

#define HDMI_AUDIO_UNDERRUN		(1U << 31)

#define HDMI_AUDIO_BUFFER_DONE		(1U << 29)



enum had_caps_list {

	HAD_GET_ELD = 1,

	HAD_GET_DISPLAY_RATE,

	HAD_GET_DP_OUTPUT,

	HAD_GET_LINK_RATE,

	HAD_SET_ENABLE_AUDIO,

	HAD_SET_DISABLE_AUDIO,

	HAD_SET_ENABLE_AUDIO_INT,

	HAD_SET_DISABLE_AUDIO_INT,

};



enum had_event_type {

	HAD_EVENT_HOT_PLUG = 1,

	HAD_EVENT_HOT_UNPLUG,

	HAD_EVENT_MODE_CHANGING,

	HAD_EVENT_AUDIO_BUFFER_DONE,

	HAD_EVENT_AUDIO_BUFFER_UNDERRUN,

	HAD_EVENT_QUERY_IS_AUDIO_BUSY,

	HAD_EVENT_QUERY_IS_AUDIO_SUSPENDED,

};

/* AUD_HDMI_STATUS register mask */

#define AUD_CONFIG_MASK_UNDERRUN	0xC0000000

#define AUD_CONFIG_MASK_SRDBG		0x00000002

#define AUD_CONFIG_MASK_FUNCRST		0x00000001



#endif