Re: [PATCH 4/5] soundwire: qcom: avoid dependency on CONFIG_SLIMBUS

[Jonathan Marek]

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@xxxxxxxx>
> > ---
> > Â 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;