bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ASoC: tas2781: remove unused acpi_subysystem_id

Browse source 
[ Upstream commit 4089d82e67a9967fc5bf2b4e5ef820d67fe73924 ]

The acpi_subysystem_id is only written and freed, not read, so
unnecessary.

Signed-off-by: Gergo Koteles <soyer@irl.hu>
Link: https://lore.kernel.org/r/454639336be28d2b50343e9c8366a56b0975e31d.1707456753.git.soyer@irl.hu
Signed-off-by: Mark Brown <broonie@kernel.org>
Stable-dep-of: c2c0b67dca3c ("ASoC: tas2781-i2c: Drop weird GPIO code")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Gergo Koteles 2024-02-09 06:59:34 +01:00 • committed by Greg Kroah-Hartman
parent 06a95f7184
commit c0f6521806
3 changed files with 0 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/sound/tas2781.h
View file

@ -101,7 +101,6 @@ struct tasdevice_priv {
struct tm tm; struct tm tm;
enum device_catlog_id catlog_id; enum device_catlog_id catlog_id;
const char *acpi_subsystem_id;
unsigned char cal_binaryname[TASDEVICE_MAX_CHANNELS][64]; unsigned char cal_binaryname[TASDEVICE_MAX_CHANNELS][64];
unsigned char crc8_lkp_tbl[CRC8_TABLE_SIZE]; unsigned char crc8_lkp_tbl[CRC8_TABLE_SIZE];
unsigned char coef_binaryname[64]; unsigned char coef_binaryname[64];

12
sound/pci/hda/tas2781_hda_i2c.c
View file

@ -95,9 +95,7 @@ static int tas2781_get_i2c_res(struct acpi_resource *ares, void *data)
static int tas2781_read_acpi(struct tasdevice_priv *p, const char *hid) static int tas2781_read_acpi(struct tasdevice_priv *p, const char *hid)
{ {
struct acpi_device *adev; struct acpi_device *adev;
struct device *physdev;
LIST_HEAD(resources); LIST_HEAD(resources);
const char *sub;
int ret; int ret;
adev = acpi_dev_get_first_match_dev(hid, NULL, -1); adev = acpi_dev_get_first_match_dev(hid, NULL, -1);
@ -113,18 +111,8 @@ static int tas2781_read_acpi(struct tasdevice_priv *p, const char *hid)
acpi_dev_free_resource_list(&resources); acpi_dev_free_resource_list(&resources);
strscpy(p->dev_name, hid, sizeof(p->dev_name)); strscpy(p->dev_name, hid, sizeof(p->dev_name));
physdev = get_device(acpi_get_first_physical_node(adev));
acpi_dev_put(adev); acpi_dev_put(adev);
/* No side-effect to the playback even if subsystem_id is NULL*/
sub = acpi_get_subsystem_id(ACPI_HANDLE(physdev));
if (IS_ERR(sub))
sub = NULL;
p->acpi_subsystem_id = sub;
put_device(physdev);
return 0; return 0;
err: err:

1
sound/soc/codecs/tas2781-comlib.c
View file

@ -408,7 +408,6 @@ void tasdevice_remove(struct tasdevice_priv *tas_priv)
{ {
if (gpio_is_valid(tas_priv->irq_info.irq_gpio)) if (gpio_is_valid(tas_priv->irq_info.irq_gpio))
gpio_free(tas_priv->irq_info.irq_gpio); gpio_free(tas_priv->irq_info.irq_gpio);
kfree(tas_priv->acpi_subsystem_id);
mutex_destroy(&tas_priv->codec_lock); mutex_destroy(&tas_priv->codec_lock);
} }
EXPORT_SYMBOL_GPL(tasdevice_remove); EXPORT_SYMBOL_GPL(tasdevice_remove);