[PATCH 0/2] admv8818 driver fixes

[PATCH 0/2] admv8818 driver fixes

[Wang ShaoBo]

admv8818 driver fixes

Wang ShaoBo (2):
  iio:filter:admv8818: Add depends on REGMAP
  iio:filter:admv8818: Fix missing clk_disable_unprepare() in
    admv8818_clk_setup

 drivers/iio/filter/Kconfig    |  2 +-
 drivers/iio/filter/admv8818.c | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

-- 
2.25.1

[PATCH 1/2] iio:filter:admv8818: Add depends on REGMAP

[Wang ShaoBo]

Add "depends on REGMAP" to CONFIG_ADMV8818, because admv8818 driver
uses structure/symbols such as 'struct regmap_config' which are defined
only when CONFIG_REGMAP is set.

Fixes: f34fe888ad05 ("iio:filter:admv8818: add support for ADMV8818")
Signed-off-by: Wang ShaoBo <bobo.shaobowang@huawei.com>
---
 drivers/iio/filter/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iio/filter/Kconfig b/drivers/iio/filter/Kconfig
index 3ae35817ad82..4bbf10f8692c 100644
--- a/drivers/iio/filter/Kconfig
+++ b/drivers/iio/filter/Kconfig
@@ -7,7 +7,7 @@ menu "Filters"
 
 config ADMV8818
 	tristate "Analog Devices ADMV8818 High-Pass and Low-Pass Filter"
-	depends on SPI && COMMON_CLK && 64BIT
+	depends on REGMAP && SPI && COMMON_CLK && 64BIT
 	help
 	  Say yes here to build support for Analog Devices ADMV8818
 	  2 GHz to 18 GHz, Digitally Tunable, High-Pass and Low-Pass Filter.
-- 
2.25.1

[PATCH 2/2] iio:filter:admv8818: Fix missing clk_disable_unprepare() in admv8818_clk_setup

[Wang ShaoBo]

Fix missing clk_disable_unprepare() before return from admv8818_clk_setup
in the error handling cases.

Fixes: f34fe888ad05 ("iio:filter:admv8818: add support for ADMV8818")
Signed-off-by: Wang ShaoBo <bobo.shaobowang@huawei.com>
---
 drivers/iio/filter/admv8818.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/iio/filter/admv8818.c b/drivers/iio/filter/admv8818.c
index 68de45fe21b4..acb436efd8b5 100644
--- a/drivers/iio/filter/admv8818.c
+++ b/drivers/iio/filter/admv8818.c
@@ -590,14 +590,22 @@ static int admv8818_clk_setup(struct admv8818_state *st)
 
 	ret = devm_add_action_or_reset(&spi->dev, admv8818_clk_disable, st);
 	if (ret)
-		return ret;
+		goto out_clk_disable;
 
 	st->nb.notifier_call = admv8818_freq_change;
 	ret = clk_notifier_register(st->clkin, &st->nb);
 	if (ret < 0)
-		return ret;
+		goto out_clk_disable;
+
+	ret = devm_add_action_or_reset(&spi->dev, admv8818_clk_notifier_unreg, st);
+	if (ret)
+		goto out_clk_disable;
+
+	return 0;
 
-	return devm_add_action_or_reset(&spi->dev, admv8818_clk_notifier_unreg, st);
+out_clk_disable:
+	clk_disable_unprepare(st->clkin);
+	return ret;
 }
 
 static int admv8818_probe(struct spi_device *spi)
-- 
2.25.1

答复: [PATCH 2/2] iio:filter:admv8818: Fix missing clk_disable_unprepare() in admv8818_clk_setup

[Wangshaobo (bobo)]

-----邮件原件-----
发件人: Wangshaobo (bobo) 
发送时间: 2022年3月18日 10:59
抄送: chengjian (D) <cj.chengjian@huawei.com>; liwei (GF) <liwei391@huawei.com>; Wangshaobo (bobo) <bobo.shaobowang@huawei.com>; antoniu.miclaus@analog.com; linux-iio@vger.kernel.org; linux-kernel@vger.kernel.org; jic23@kernel.org; Jonathan Cameron <jonathan.cameron@huawei.com>
主题: [PATCH 2/2] iio:filter:admv8818: Fix missing clk_disable_unprepare() in admv8818_clk_setup

Fix missing clk_disable_unprepare() before return from admv8818_clk_setup in the error handling cases.

Fixes: f34fe888ad05 ("iio:filter:admv8818: add support for ADMV8818")
Signed-off-by: Wang ShaoBo <bobo.shaobowang@huawei.com>
---
 drivers/iio/filter/admv8818.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/iio/filter/admv8818.c b/drivers/iio/filter/admv8818.c index 68de45fe21b4..acb436efd8b5 100644
--- a/drivers/iio/filter/admv8818.c
+++ b/drivers/iio/filter/admv8818.c
@@ -590,14 +590,22 @@ static int admv8818_clk_setup(struct admv8818_state *st)
 
 	ret = devm_add_action_or_reset(&spi->dev, admv8818_clk_disable, st);
 	if (ret)
-		return ret;
+		goto out_clk_disable;

admv8818_clk_disable() would do clk_disable_unprepare(), so clk_disable_unprepare() is not needed after
devm_add_action_or_reset(),there is no problem in this function.

this patch is not needed anymore.

-- wangshaobo

RE: [PATCH 1/2] iio:filter:admv8818: Add depends on REGMAP

[Sa, Nuno]

Hi Wang,

Thanks for the patch

> -----Original Message-----
> From: Wang ShaoBo <bobo.shaobowang@huawei.com>
> Sent: Friday, March 18, 2022 3:59 AM
> Cc: cj.chengjian@huawei.com; liwei391@huawei.com;
> bobo.shaobowang@huawei.com; Miclaus, Antoniu
> <Antoniu.Miclaus@analog.com>; linux-iio@vger.kernel.org; linux-
> kernel@vger.kernel.org; jic23@kernel.org;
> Jonathan.Cameron@huawei.com
> Subject: [PATCH 1/2] iio:filter:admv8818: Add depends on REGMAP
> 
> [External]
> 
> Add "depends on REGMAP" to CONFIG_ADMV8818, because
> admv8818 driver
> uses structure/symbols such as 'struct regmap_config' which are
> defined
> only when CONFIG_REGMAP is set.
> 
> Fixes: f34fe888ad05 ("iio:filter:admv8818: add support for ADMV8818")
> Signed-off-by: Wang ShaoBo <bobo.shaobowang@huawei.com>
> ---
>  drivers/iio/filter/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/iio/filter/Kconfig b/drivers/iio/filter/Kconfig
> index 3ae35817ad82..4bbf10f8692c 100644
> --- a/drivers/iio/filter/Kconfig
> +++ b/drivers/iio/filter/Kconfig
> @@ -7,7 +7,7 @@ menu "Filters"
> 
>  config ADMV8818
>  	tristate "Analog Devices ADMV8818 High-Pass and Low-Pass
> Filter"
> -	depends on SPI && COMMON_CLK && 64BIT
> +	depends on REGMAP && SPI && COMMON_CLK && 64BIT

I think the best way is to have select REGMAP_SPI. Hence:

    depends on SPI && COMMON_CLK && 64BIT
    select REGMAP_SPI

This will automatically default CONFIG_REGMAP to y. with your
patch, I guess we can still have issues with ' __devm_regmap_init_spi()'

- Nuno Sá

Re: [PATCH 1/2] iio:filter:admv8818: Add depends on REGMAP

[Wangshaobo (bobo)]

在 2022/3/18 16:45, Sa, Nuno 写道:
> Hi Wang,
>
> Thanks for the patch
>
>> -----Original Message-----
>> From: Wang ShaoBo <bobo.shaobowang@huawei.com>
>> Sent: Friday, March 18, 2022 3:59 AM
>> Cc: cj.chengjian@huawei.com; liwei391@huawei.com;
>> bobo.shaobowang@huawei.com; Miclaus, Antoniu
>> <Antoniu.Miclaus@analog.com>; linux-iio@vger.kernel.org; linux-
>> kernel@vger.kernel.org; jic23@kernel.org;
>> Jonathan.Cameron@huawei.com
>> Subject: [PATCH 1/2] iio:filter:admv8818: Add depends on REGMAP
>>
>> [External]
>>
>> Add "depends on REGMAP" to CONFIG_ADMV8818, because
>> admv8818 driver
>> uses structure/symbols such as 'struct regmap_config' which are
>> defined
>> only when CONFIG_REGMAP is set.
>>
>> Fixes: f34fe888ad05 ("iio:filter:admv8818: add support for ADMV8818")
>> Signed-off-by: Wang ShaoBo <bobo.shaobowang@huawei.com>
>> ---
>>   drivers/iio/filter/Kconfig | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/iio/filter/Kconfig b/drivers/iio/filter/Kconfig
>> index 3ae35817ad82..4bbf10f8692c 100644
>> --- a/drivers/iio/filter/Kconfig
>> +++ b/drivers/iio/filter/Kconfig
>> @@ -7,7 +7,7 @@ menu "Filters"
>>
>>   config ADMV8818
>>   	tristate "Analog Devices ADMV8818 High-Pass and Low-Pass
>> Filter"
>> -	depends on SPI && COMMON_CLK && 64BIT
>> +	depends on REGMAP && SPI && COMMON_CLK && 64BIT
> I think the best way is to have select REGMAP_SPI. Hence:
>
>      depends on SPI && COMMON_CLK && 64BIT
>      select REGMAP_SPI
>
> This will automatically default CONFIG_REGMAP to y. with your
> patch, I guess we can still have issues with ' __devm_regmap_init_spi()'
>
> - Nuno Sá
> .

Yes, only set REGMAP but REGMAP_SPI may causing __devm_regmap_init_spi 
undeined.

-- wangshaobo