Messages in this thread | | | Subject | Re: [PATCH 4/5] soundwire: qcom: avoid dependency on CONFIG_SLIMBUS | From | Jonathan Marek <> | Date | Mon, 8 Jun 2020 17:46:49 -0400 |
| |
On 6/8/20 5:20 PM, Pierre-Louis Bossart wrote: > > > On 6/8/20 3:43 PM, Jonathan Marek wrote: >> The driver may be used without slimbus, so don't depend on slimbus. >> >> Signed-off-by: Jonathan Marek <jonathan@marek.ca> >> --- >> drivers/soundwire/Kconfig | 1 - >> drivers/soundwire/qcom.c | 5 +++++ >> 2 files changed, 5 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/soundwire/Kconfig b/drivers/soundwire/Kconfig >> index fa2b4ab92ed9..d121cf739090 100644 >> --- a/drivers/soundwire/Kconfig >> +++ b/drivers/soundwire/Kconfig >> @@ -33,7 +33,6 @@ config SOUNDWIRE_INTEL >> config SOUNDWIRE_QCOM >> tristate "Qualcomm SoundWire Master driver" >> - depends on SLIMBUS >> depends on SND_SOC >> help >> SoundWire Qualcomm Master driver. >> diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c >> index 14334442615f..ac81c64768ea 100644 >> --- a/drivers/soundwire/qcom.c >> +++ b/drivers/soundwire/qcom.c >> @@ -769,13 +769,18 @@ static int qcom_swrm_probe(struct >> platform_device *pdev) >> if (!ctrl) >> return -ENOMEM; >> +#ifdef CONFIG_SLIMBUS >> if (dev->parent->bus == &slimbus_bus) { >> +#else >> + if (false) { >> +#endif > > > maybe: > > if (IS_ENABLED(CONFIG_SLIMBUS) && > dev->parent->bus == &slimbus_bus) > >
It won't compile like this, because "slimbus_bus" is not defined when CONFIG_SLIMBUS is disabled.
>> ctrl->reg_read = qcom_swrm_ahb_reg_read; >> ctrl->reg_write = qcom_swrm_ahb_reg_write; >> ctrl->regmap = dev_get_regmap(dev->parent, NULL); >> if (!ctrl->regmap) >> return -EINVAL; >> } else { >> + >> res = platform_get_resource(pdev, IORESOURCE_MEM, 0); >> ctrl->reg_read = qcom_swrm_cpu_reg_read; >>
| |