d4ff1b3917
The SOF HD-audio bus has its house-made initialization code. It's supposedly for making the code independent from HD-audio bus drivers. However, this is error-prone, and above all, the SOF driver has already dependency on HD-audio bus driver when CONFIG_SND_SOF_HDA is set. That is, if this Kconfig is set, there is no reason to avoid the call to the proper bus init function. Also, the ext_ops that is set at bus initialization can be better handled inside sof_hda_bus_init(). We don't need to refer this outside the bus initialization. So this patch addresses these issues: - sof_hda_bus_init() calls nothing but snd_hdac_ext_bus_init() when CONFIG_SND_SOF_HDA is set. Otherwise some fields are initialized locally like before for avoiding the dependency. - ext_ops is referred inside sof_hda_bus_init(). The ext_ops argument of snd_hda_bus_init() is dropped. Acked-by: Mark Brown <broonie@kernel.org> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
45 lines
1.1 KiB
C
45 lines
1.1 KiB
C
// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
|
|
//
|
|
// This file is provided under a dual BSD/GPLv2 license. When using or
|
|
// redistributing this file, you may do so under either license.
|
|
//
|
|
// Copyright(c) 2018 Intel Corporation. All rights reserved.
|
|
//
|
|
// Authors: Keyon Jie <yang.jie@linux.intel.com>
|
|
|
|
#include <linux/io.h>
|
|
#include <sound/hdaudio.h>
|
|
#include "../sof-priv.h"
|
|
#include "hda.h"
|
|
|
|
#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)
|
|
#define sof_hda_ext_ops snd_soc_hdac_hda_get_ops()
|
|
#else
|
|
#define sof_hda_ext_ops NULL
|
|
#endif
|
|
|
|
/*
|
|
* This can be used for both with/without hda link support.
|
|
*/
|
|
void sof_hda_bus_init(struct hdac_bus *bus, struct device *dev)
|
|
{
|
|
#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
|
|
snd_hdac_ext_bus_init(bus, dev, NULL, sof_hda_ext_ops);
|
|
#else /* CONFIG_SND_SOC_SOF_HDA */
|
|
memset(bus, 0, sizeof(*bus));
|
|
bus->dev = dev;
|
|
|
|
INIT_LIST_HEAD(&bus->stream_list);
|
|
|
|
bus->irq = -1;
|
|
|
|
/*
|
|
* There is only one HDA bus atm. keep the index as 0.
|
|
* Need to fix when there are more than one HDA bus.
|
|
*/
|
|
bus->idx = 0;
|
|
|
|
spin_lock_init(&bus->reg_lock);
|
|
#endif /* CONFIG_SND_SOC_SOF_HDA */
|
|
}
|