Merge series "ASoC: rt5682: fix Kconfig/compilation issues when I2C is not selected" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:
RT5682 can work in I2C or SoundWire mode, but the code will not compile if I2C is not selected. Reported-by: kbuild test robot <lkp@intel.com> Pierre-Louis Bossart (3): ASoC: rt5682: fix unmet dependencies ASoC: rt5682: fix compilation issues without I2C ASoC: rt5682-sdw: fix 'defined but not used' pm functions sound/soc/codecs/Kconfig | 2 +- sound/soc/codecs/rt5682-sdw.c | 4 ++-- sound/soc/codecs/rt5682.c | 10 ++++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) -- 2.20.1
This commit is contained in:
Коммит
ad7366a68a
|
@ -1135,7 +1135,7 @@ config SND_SOC_RT5677_SPI
|
|||
|
||||
config SND_SOC_RT5682
|
||||
tristate
|
||||
depends on I2C
|
||||
depends on I2C || SOUNDWIRE
|
||||
|
||||
config SND_SOC_RT5682_SDW
|
||||
tristate "Realtek RT5682 Codec - SDW"
|
||||
|
|
|
@ -270,7 +270,7 @@ static const struct sdw_device_id rt5682_id[] = {
|
|||
};
|
||||
MODULE_DEVICE_TABLE(sdw, rt5682_id);
|
||||
|
||||
static int rt5682_dev_suspend(struct device *dev)
|
||||
static int __maybe_unused rt5682_dev_suspend(struct device *dev)
|
||||
{
|
||||
struct rt5682_priv *rt5682 = dev_get_drvdata(dev);
|
||||
|
||||
|
@ -283,7 +283,7 @@ static int rt5682_dev_suspend(struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int rt5682_dev_resume(struct device *dev)
|
||||
static int __maybe_unused rt5682_dev_resume(struct device *dev)
|
||||
{
|
||||
struct sdw_slave *slave = dev_to_sdw_dev(dev);
|
||||
struct rt5682_priv *rt5682 = dev_get_drvdata(dev);
|
||||
|
|
Загрузка…
Ссылка в новой задаче