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

Commit 404735c9 authored by Vinod Koul's avatar Vinod Koul Committed by Takashi Iwai
Browse files

ALSA - Ext hda: remove bus_parse_capabilities 



Remove the unused one as we have moved it up to hdac core.

Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ec8ae570

include/sound/hdaudio_ext.h

+0 −12
Original line number Diff line number Diff line
@@ -8,11 +8,6 @@ 
 *

 * @bus: hdac bus

 * @num_streams: streams supported

 * @ppcap: pp capabilities pointer

 * @spbcap: SPIB capabilities pointer

 * @mlcap: MultiLink capabilities pointer

 * @gtscap: gts capabilities pointer

 * @drsmcap: dma resume capabilities pointer

 * @hlink_list: link list of HDA links

 * @lock: lock for link mgmt

 * @cmd_dma_state: state of cmd DMAs: CORB and RIRB
@@ -22,12 +17,6 @@ struct hdac_ext_bus { 
	int num_streams;

	int idx;



	void __iomem *ppcap;

	void __iomem *spbcap;

	void __iomem *mlcap;

	void __iomem *gtscap;

	void __iomem *drsmcap;



	struct list_head hlink_list;



	struct mutex lock;
@@ -54,7 +43,6 @@ void snd_hdac_ext_bus_device_remove(struct hdac_ext_bus *ebus); 
#define HDA_CODEC_EXT_ENTRY(_vid, _revid, _name, _drv_data) \

	HDA_CODEC_REV_EXT_ENTRY(_vid, _revid, _name, _drv_data)



int snd_hdac_ext_bus_parse_capabilities(struct hdac_ext_bus *sbus);

void snd_hdac_ext_bus_ppcap_enable(struct hdac_ext_bus *chip, bool enable);

void snd_hdac_ext_bus_ppcap_int_enable(struct hdac_ext_bus *chip, bool enable);

sound/hda/ext/hdac_ext_controller.c

+0 −75
Original line number Diff line number Diff line
@@ -29,81 +29,6 @@ 
 */

#define HDAC_MAX_CAPS 10



/**

 * snd_hdac_ext_bus_parse_capabilities - parse capablity structure

 * @ebus: the pointer to extended bus object

 *

 * Returns 0 if successful, or a negative error code.

 */

int snd_hdac_ext_bus_parse_capabilities(struct hdac_ext_bus *ebus)

{

	unsigned int cur_cap;

	unsigned int offset;

	struct hdac_bus *bus = &ebus->bus;

	unsigned int counter = 0;



	offset = snd_hdac_chip_readl(bus, LLCH);



	/* Lets walk the linked capabilities list */

	do {

		cur_cap = _snd_hdac_chip_read(l, bus, offset);



		dev_dbg(bus->dev, "Capability version: 0x%x\n",

				((cur_cap & AZX_CAP_HDR_VER_MASK) >> AZX_CAP_HDR_VER_OFF));



		dev_dbg(bus->dev, "HDA capability ID: 0x%x\n",

				(cur_cap & AZX_CAP_HDR_ID_MASK) >> AZX_CAP_HDR_ID_OFF);



		switch ((cur_cap & AZX_CAP_HDR_ID_MASK) >> AZX_CAP_HDR_ID_OFF) {

		case AZX_ML_CAP_ID:

			dev_dbg(bus->dev, "Found ML capability\n");

			ebus->mlcap = bus->remap_addr + offset;

			break;



		case AZX_GTS_CAP_ID:

			dev_dbg(bus->dev, "Found GTS capability offset=%x\n", offset);

			ebus->gtscap = bus->remap_addr + offset;

			break;



		case AZX_PP_CAP_ID:

			/* PP capability found, the Audio DSP is present */

			dev_dbg(bus->dev, "Found PP capability offset=%x\n", offset);

			ebus->ppcap = bus->remap_addr + offset;

			break;



		case AZX_SPB_CAP_ID:

			/* SPIB capability found, handler function */

			dev_dbg(bus->dev, "Found SPB capability\n");

			ebus->spbcap = bus->remap_addr + offset;

			break;



		case AZX_DRSM_CAP_ID:

			/* DMA resume  capability found, handler function */

			dev_dbg(bus->dev, "Found DRSM capability\n");

			ebus->drsmcap = bus->remap_addr + offset;

			break;



		default:

			dev_dbg(bus->dev, "Unknown capability %d\n", cur_cap);

			break;

		}



		counter++;



		if (counter > HDAC_MAX_CAPS) {

			dev_err(bus->dev, "We exceeded HDAC Ext capablities!!!\n");

			break;

		}



		/* read the offset of next capabiity */

		offset = cur_cap & AZX_CAP_HDR_NXT_PTR_MASK;



	} while (offset);



	return 0;

}

EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_parse_capabilities);



/*

 * processing pipe helpers - these helpers are useful for dealing with HDA

 * new capability of processing pipelines