Unverified Commit 9d5536e0 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda: Remove conditions against CONFIG_PCI 



The HDA support can only be compiled when SND_SOC_SOF_PCI is enabled which
depends on CONFIG_PCI.

This makes the IS_ENABLED(CONFIG_PCI) checks redundant in the code, they
will resolve to true all the time.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20210521092804.3721324-8-kai.vehmanen@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4f50f16e

sound/soc/sof/intel/hda.c

+3 −5
Original line number Diff line number Diff line
@@ -277,10 +277,12 @@ struct hda_dsp_msg_code { 
	const char *msg;

};



static bool hda_use_msi = IS_ENABLED(CONFIG_PCI);

#if IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG)

static bool hda_use_msi = true;

module_param_named(use_msi, hda_use_msi, bool, 0444);

MODULE_PARM_DESC(use_msi, "SOF HDA use PCI MSI mode");

#else

#define hda_use_msi	(1)

#endif



static char *hda_model;
@@ -485,9 +487,7 @@ static int hda_init(struct snd_sof_dev *sdev) 


	/* initialise hdac bus */

	bus->addr = pci_resource_start(pci, 0);

#if IS_ENABLED(CONFIG_PCI)

	bus->remap_addr = pci_ioremap_bar(pci, 0);

#endif

	if (!bus->remap_addr) {

		dev_err(bus->dev, "error: ioremap error\n");

		return -ENXIO;
@@ -799,9 +799,7 @@ int hda_dsp_probe(struct snd_sof_dev *sdev) 
		goto hdac_bus_unmap;



	/* DSP base */

#if IS_ENABLED(CONFIG_PCI)

	sdev->bar[HDA_DSP_BAR] = pci_ioremap_bar(pci, HDA_DSP_BAR);

#endif

	if (!sdev->bar[HDA_DSP_BAR]) {

		dev_err(sdev->dev, "error: ioremap error\n");

		ret = -ENXIO;