From dcea2ba909d7ab29ff208b928edaacfa1e73ac92 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 11 Dec 2023 12:26:53 +0000 Subject: [PATCH] Revert "ASoC: soc-card: Add storage for PCI SSID" This reverts commit 14107cbeb5f709d0bb25e0d334a225cfb5280dce which is commit 47f56e38a199bd45514b8e0142399cba4feeaf1a upstream. It breaks the current Android ABI, and if needed, can be brought back in an abi-safe way in the future. Bug: 161946584 Change-Id: Id1365ae92d3fef88cb8e0575b6b258d244092404 Signed-off-by: Greg Kroah-Hartman --- include/sound/soc-card.h | 37 ------------------------------------- include/sound/soc.h | 11 ----------- 2 files changed, 48 deletions(-) diff --git a/include/sound/soc-card.h b/include/sound/soc-card.h index e8ff2e089cd0..fc94dfb0021f 100644 --- a/include/sound/soc-card.h +++ b/include/sound/soc-card.h @@ -59,43 +59,6 @@ int snd_soc_card_add_dai_link(struct snd_soc_card *card, void snd_soc_card_remove_dai_link(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link); -#ifdef CONFIG_PCI -static inline void snd_soc_card_set_pci_ssid(struct snd_soc_card *card, - unsigned short vendor, - unsigned short device) -{ - card->pci_subsystem_vendor = vendor; - card->pci_subsystem_device = device; - card->pci_subsystem_set = true; -} - -static inline int snd_soc_card_get_pci_ssid(struct snd_soc_card *card, - unsigned short *vendor, - unsigned short *device) -{ - if (!card->pci_subsystem_set) - return -ENOENT; - - *vendor = card->pci_subsystem_vendor; - *device = card->pci_subsystem_device; - - return 0; -} -#else /* !CONFIG_PCI */ -static inline void snd_soc_card_set_pci_ssid(struct snd_soc_card *card, - unsigned short vendor, - unsigned short device) -{ -} - -static inline int snd_soc_card_get_pci_ssid(struct snd_soc_card *card, - unsigned short *vendor, - unsigned short *device) -{ - return -ENOENT; -} -#endif /* CONFIG_PCI */ - /* device driver data */ static inline void snd_soc_card_set_drvdata(struct snd_soc_card *card, void *data) diff --git a/include/sound/soc.h b/include/sound/soc.h index 8007d6e37a49..8ff2d1234188 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -924,17 +924,6 @@ struct snd_soc_card { #ifdef CONFIG_DMI char dmi_longname[80]; #endif /* CONFIG_DMI */ - -#ifdef CONFIG_PCI - /* - * PCI does not define 0 as invalid, so pci_subsystem_set indicates - * whether a value has been written to these fields. - */ - unsigned short pci_subsystem_vendor; - unsigned short pci_subsystem_device; - bool pci_subsystem_set; -#endif /* CONFIG_PCI */ - char topology_shortname[32]; struct device *dev;