Commit bdd9ea91 authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Takashi Iwai
Browse files

ALSA: hda/hda_cs_dsp_ctl: Delete hda_cs_dsp_ctl module 



Delete the hda_cs_dsp module and move the one array and one function
that is used by the cs35l41_hda driver into that driver.

The cs35l41 and cs35l56 drivers stopped creating ALSA controls to
wrap firmware controls. The reasons are explained in:

commit 312c04ce ("ALSA: hda: cs35l41: Stop creating ALSA Controls
for firmware coefficients")

and

commit 34e1b1bb ("ALSA: hda: cs35l56: Stop creating ALSA controls
for firmware coefficients")

The cs35l56_hda driver now doesn't use hda_cs_dsp_ctl at all. The
cs35l41_hda driver only uses the small array of firmware names and the
function to read a control value. All other functions and data in
hda_cs_dsp_ctl are unused. There is no need to keep a separate module
for such a small amount of data and code that is only used by one driver,
so remove the whole module.

Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Link: https://patch.msgid.link/20250424181214.66759-1-rf@opensource.cirrus.com


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

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -5647,7 +5647,6 @@ F: include/sound/cs* 
F:	sound/pci/hda/cirrus*

F:	sound/pci/hda/cs*

F:	sound/pci/hda/hda_component*

F:	sound/pci/hda/hda_cs_dsp_ctl.*

F:	sound/soc/codecs/cs*









CIRRUS LOGIC HAPTIC DRIVERS
































sound/pci/hda/Kconfig



+0
−8






























Original line number
Diff line number
Diff line







@@ -110,10 +110,6 @@ config SND_HDA_SCODEC_CS35L41







	select SND_HDA_GENERIC









	select REGMAP_IRQ



















config SND_HDA_CS_DSP_CONTROLS









	tristate









	select FW_CS_DSP



















config SND_HDA_SCODEC_COMPONENT









	tristate


















@@ -125,7 +121,6 @@ config SND_HDA_SCODEC_CS35L41_I2C







	depends on SND_SOC









	select SND_SOC_CS35L41_LIB









	select SND_HDA_SCODEC_CS35L41









	select SND_HDA_CS_DSP_CONTROLS









	select SND_SOC_CS_AMP_LIB









	help









	  Say Y or M here to include CS35L41 I2C HD-audio side codec support








@@ -142,7 +137,6 @@ config SND_HDA_SCODEC_CS35L41_SPI







	depends on SND_SOC









	select SND_SOC_CS35L41_LIB









	select SND_HDA_SCODEC_CS35L41









	select SND_HDA_CS_DSP_CONTROLS









	select SND_SOC_CS_AMP_LIB









	help









	  Say Y or M here to include CS35L41 SPI HD-audio side codec support








@@ -165,7 +159,6 @@ config SND_HDA_SCODEC_CS35L56_I2C







	select SND_SOC_CS35L56_SHARED









	select SND_HDA_SCODEC_CS35L56









	select SND_HDA_CIRRUS_SCODEC









	select SND_HDA_CS_DSP_CONTROLS









	select SND_SOC_CS_AMP_LIB









	help









	  Say Y or M here to include CS35L56 amplifier support with








@@ -182,7 +175,6 @@ config SND_HDA_SCODEC_CS35L56_SPI







	select SND_SOC_CS35L56_SHARED









	select SND_HDA_SCODEC_CS35L56









	select SND_HDA_CIRRUS_SCODEC









	select SND_HDA_CS_DSP_CONTROLS









	select SND_SOC_CS_AMP_LIB









	help









	  Say Y or M here to include CS35L56 amplifier support with
































sound/pci/hda/Makefile



+0
−2






























Original line number
Diff line number
Diff line







@@ -37,7 +37,6 @@ snd-hda-scodec-cs35l41-spi-y :=	cs35l41_hda_spi.o







snd-hda-scodec-cs35l56-y :=	cs35l56_hda.o









snd-hda-scodec-cs35l56-i2c-y :=	cs35l56_hda_i2c.o









snd-hda-scodec-cs35l56-spi-y :=	cs35l56_hda_spi.o









snd-hda-cs-dsp-ctls-y :=	hda_cs_dsp_ctl.o









snd-hda-scodec-component-y :=	hda_component.o









snd-hda-scodec-tas2781-i2c-y :=	tas2781_hda_i2c.o









snd-hda-scodec-tas2781-spi-y :=	tas2781_hda_spi.o tas2781_spi_fwlib.o








@@ -70,7 +69,6 @@ obj-$(CONFIG_SND_HDA_SCODEC_CS35L41_SPI) += snd-hda-scodec-cs35l41-spi.o







obj-$(CONFIG_SND_HDA_SCODEC_CS35L56) += snd-hda-scodec-cs35l56.o









obj-$(CONFIG_SND_HDA_SCODEC_CS35L56_I2C) += snd-hda-scodec-cs35l56-i2c.o









obj-$(CONFIG_SND_HDA_SCODEC_CS35L56_SPI) += snd-hda-scodec-cs35l56-spi.o









obj-$(CONFIG_SND_HDA_CS_DSP_CONTROLS) += snd-hda-cs-dsp-ctls.o









obj-$(CONFIG_SND_HDA_SCODEC_COMPONENT) += snd-hda-scodec-component.o









obj-$(CONFIG_SND_HDA_SCODEC_TAS2781_I2C) += snd-hda-scodec-tas2781-i2c.o









obj-$(CONFIG_SND_HDA_SCODEC_TAS2781_SPI) += snd-hda-scodec-tas2781-spi.o
































sound/pci/hda/cs35l41_hda.c



+38
−13






























Original line number
Diff line number
Diff line







@@ -20,7 +20,6 @@







#include "hda_generic.h"









#include "hda_component.h"









#include "cs35l41_hda.h"









#include "hda_cs_dsp_ctl.h"









#include "cs35l41_hda_property.h"



















#define CS35L41_PART "cs35l41"








@@ -74,6 +73,21 @@ static const struct cirrus_amp_cal_controls cs35l41_calibration_controls = {







	.checksum =	CAL_CHECKSUM_DSP_CTL_NAME,









};



















enum cs35l41_hda_fw_id {









	CS35L41_HDA_FW_SPK_PROT,









	CS35L41_HDA_FW_SPK_CALI,









	CS35L41_HDA_FW_SPK_DIAG,









	CS35L41_HDA_FW_MISC,









	CS35L41_HDA_NUM_FW









};



















static const char * const cs35l41_hda_fw_ids[CS35L41_HDA_NUM_FW] = {









	[CS35L41_HDA_FW_SPK_PROT] = "spk-prot",









	[CS35L41_HDA_FW_SPK_CALI] = "spk-cali",









	[CS35L41_HDA_FW_SPK_DIAG] = "spk-diag",









	[CS35L41_HDA_FW_MISC] =     "misc",









};



















static bool firmware_autostart = 1;









module_param(firmware_autostart, bool, 0444);









MODULE_PARM_DESC(firmware_autostart, "Allow automatic firmware download on boot"








@@ -169,23 +183,23 @@ static int cs35l41_request_firmware_file(struct cs35l41_hda *cs35l41,

















	if (spkid > -1 && ssid && amp_name)









		*filename = kasprintf(GFP_KERNEL, "cirrus/%s-%s-%s-%s-spkid%d-%s.%s", CS35L41_PART,









				      dsp_name, hda_cs_dsp_fw_ids[cs35l41->firmware_type],









				      dsp_name, cs35l41_hda_fw_ids[cs35l41->firmware_type],









				      ssid, spkid, amp_name, filetype);









	else if (spkid > -1 && ssid)









		*filename = kasprintf(GFP_KERNEL, "cirrus/%s-%s-%s-%s-spkid%d.%s", CS35L41_PART,









				      dsp_name, hda_cs_dsp_fw_ids[cs35l41->firmware_type],









				      dsp_name, cs35l41_hda_fw_ids[cs35l41->firmware_type],









				      ssid, spkid, filetype);









	else if (ssid && amp_name)









		*filename = kasprintf(GFP_KERNEL, "cirrus/%s-%s-%s-%s-%s.%s", CS35L41_PART,









				      dsp_name, hda_cs_dsp_fw_ids[cs35l41->firmware_type],









				      dsp_name, cs35l41_hda_fw_ids[cs35l41->firmware_type],









				      ssid, amp_name, filetype);









	else if (ssid)









		*filename = kasprintf(GFP_KERNEL, "cirrus/%s-%s-%s-%s.%s", CS35L41_PART,









				      dsp_name, hda_cs_dsp_fw_ids[cs35l41->firmware_type],









				      dsp_name, cs35l41_hda_fw_ids[cs35l41->firmware_type],









				      ssid, filetype);









	else









		*filename = kasprintf(GFP_KERNEL, "cirrus/%s-%s-%s.%s", CS35L41_PART,









				      dsp_name, hda_cs_dsp_fw_ids[cs35l41->firmware_type],









				      dsp_name, cs35l41_hda_fw_ids[cs35l41->firmware_type],









				      filetype);



















	if (*filename == NULL)








@@ -588,7 +602,7 @@ static int cs35l41_init_dsp(struct cs35l41_hda *cs35l41)







	}



















	ret = cs_dsp_power_up(dsp, wmfw_firmware, wmfw_filename, coeff_firmware, coeff_filename,









			      hda_cs_dsp_fw_ids[cs35l41->firmware_type]);









			      cs35l41_hda_fw_ids[cs35l41->firmware_type]);









	if (ret)









		goto err;


















@@ -1108,6 +1122,18 @@ static int cs35l41_runtime_resume(struct device *dev)







	return ret;









}



















static int cs35l41_hda_read_ctl(struct cs_dsp *dsp, const char *name, int type,









				unsigned int alg, void *buf, size_t len)









{









	int ret;



















	mutex_lock(&dsp->pwr_lock);









	ret = cs_dsp_coeff_read_ctrl(cs_dsp_get_ctl(dsp, name, type, alg), 0, buf, len);









	mutex_unlock(&dsp->pwr_lock);



















	return ret;









}



















static int cs35l41_smart_amp(struct cs35l41_hda *cs35l41)









{









	unsigned int fw_status;








@@ -1137,7 +1163,7 @@ static int cs35l41_smart_amp(struct cs35l41_hda *cs35l41)







		goto clean_dsp;









	}



















	ret = read_poll_timeout(hda_cs_dsp_read_ctl, ret,









	ret = read_poll_timeout(cs35l41_hda_read_ctl, ret,









				be32_to_cpu(halo_sts) == HALO_STATE_CODE_RUN,









				1000, 15000, false, &cs35l41->cs_dsp, HALO_STATE_DSP_CTL_NAME,









				HALO_STATE_DSP_CTL_TYPE, HALO_STATE_DSP_CTL_ALG,








@@ -1174,7 +1200,7 @@ static int cs35l41_smart_amp(struct cs35l41_hda *cs35l41)







	}



















	dev_info(cs35l41->dev, "Firmware Loaded - Type: %s, Gain: %d\n",









		 hda_cs_dsp_fw_ids[cs35l41->firmware_type], cs35l41->tuning_gain);









		 cs35l41_hda_fw_ids[cs35l41->firmware_type], cs35l41->tuning_gain);



















	return 0;


















@@ -1276,7 +1302,7 @@ static int cs35l41_fw_type_ctl_put(struct snd_kcontrol *kcontrol,







{









	struct cs35l41_hda *cs35l41 = snd_kcontrol_chip(kcontrol);



















	if (ucontrol->value.enumerated.item[0] < HDA_CS_DSP_NUM_FW) {









	if (ucontrol->value.enumerated.item[0] < CS35L41_HDA_NUM_FW) {









		if (cs35l41->firmware_type != ucontrol->value.enumerated.item[0]) {









			cs35l41->firmware_type = ucontrol->value.enumerated.item[0];









			return 1;








@@ -1290,7 +1316,7 @@ static int cs35l41_fw_type_ctl_put(struct snd_kcontrol *kcontrol,

















static int cs35l41_fw_type_ctl_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)









{









	return snd_ctl_enum_info(uinfo, 1, ARRAY_SIZE(hda_cs_dsp_fw_ids), hda_cs_dsp_fw_ids);









	return snd_ctl_enum_info(uinfo, 1, ARRAY_SIZE(cs35l41_hda_fw_ids), cs35l41_hda_fw_ids);









}



















static int cs35l41_create_controls(struct cs35l41_hda *cs35l41)








@@ -1430,7 +1456,7 @@ static int cs35l41_hda_bind(struct device *dev, struct device *master, void *mas

















	strscpy(comp->name, dev_name(dev), sizeof(comp->name));



















	cs35l41->firmware_type = HDA_CS_DSP_FW_SPK_PROT;









	cs35l41->firmware_type = CS35L41_HDA_FW_SPK_PROT;



















	if (firmware_autostart) {









		dev_dbg(cs35l41->dev, "Firmware Autostart.\n");








@@ -2055,7 +2081,6 @@ const struct dev_pm_ops cs35l41_hda_pm_ops = {







EXPORT_SYMBOL_NS_GPL(cs35l41_hda_pm_ops, "SND_HDA_SCODEC_CS35L41");



















MODULE_DESCRIPTION("CS35L41 HDA Driver");









MODULE_IMPORT_NS("SND_HDA_CS_DSP_CONTROLS");









MODULE_IMPORT_NS("SND_SOC_CS_AMP_LIB");









MODULE_AUTHOR("Lucas Tanure, Cirrus Logic Inc, <tanureal@opensource.cirrus.com>");









MODULE_LICENSE("GPL");
































sound/pci/hda/cs35l56_hda.c



+0
−2






























Original line number
Diff line number
Diff line







@@ -20,7 +20,6 @@







#include "cirrus_scodec.h"









#include "cs35l56_hda.h"









#include "hda_component.h"









#include "hda_cs_dsp_ctl.h"









#include "hda_generic.h"



















 /*








@@ -1118,7 +1117,6 @@ EXPORT_SYMBOL_NS_GPL(cs35l56_hda_pm_ops, "SND_HDA_SCODEC_CS35L56");







MODULE_DESCRIPTION("CS35L56 HDA Driver");









MODULE_IMPORT_NS("FW_CS_DSP");









MODULE_IMPORT_NS("SND_HDA_CIRRUS_SCODEC");









MODULE_IMPORT_NS("SND_HDA_CS_DSP_CONTROLS");









MODULE_IMPORT_NS("SND_SOC_CS35L56_SHARED");









MODULE_IMPORT_NS("SND_SOC_CS_AMP_LIB");









MODULE_AUTHOR("Richard Fitzgerald <rf@opensource.cirrus.com>");