Skip to contentSkip to conversation

iio: frequency: adrf6780: Fix adrf6780_spi_{read,write}()

PATCH In review Nathan Chancellor 3 participants 3 messages Oct 22, 2021 – Oct 24, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iio: frequency: adrf6780: Fix adrf6780_spi_{read,write}()

Clang warns:

drivers/iio/frequency/adrf6780.c:117:1: error: all paths through this function will call itself [-Werror,-Winfinite-recursion]
{
^
drivers/iio/frequency/adrf6780.c:138:1: error: all paths through this function will call itself [-Werror,-Winfinite-recursion]
{
^
2 errors generated.

The underscore variants should be used here.

Fixes 63aaf6d06d87 ("iio: frequency: adrf6780: add support for ADRF6780")
---
 drivers/iio/frequency/adrf6780.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/frequency/adrf6780.c +2 -2
index abe8b30fceca..8255ffd174f6 100644
@@ -118,7 +118,7 @@ static int adrf6780_spi_read(struct adrf6780_state *st, unsigned int reg,
 	int ret;
 
 	mutex_lock(&st->lock);
-	ret = adrf6780_spi_read(st, reg, val);
+	ret = __adrf6780_spi_read(st, reg, val);
 	mutex_unlock(&st->lock);
 
 	return ret;
@@ -139,7 +139,7 @@ static int adrf6780_spi_write(struct adrf6780_state *st, unsigned int reg,
 	int ret;
 
 	mutex_lock(&st->lock);
-	ret = adrf6780_spi_write(st, reg, val);
+	ret = __adrf6780_spi_write(st, reg, val);
 	mutex_unlock(&st->lock);
 
 	return ret;

base-commit: 77af145dc7eadcb78d38912b67d6a68050d21a9b

Signature · 1 line
2.33.1.637.gf443b226ca
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 12 lines · On Fri, 22 Oct 2021 12:56:56 -0700 Nathan Chancellor <[email protected]> wrote:

Clang warns:

drivers/iio/frequency/adrf6780.c:117:1: error: all paths through this function will call itself [-Werror,-Winfinite-recursion]
{
^
drivers/iio/frequency/adrf6780.c:138:1: error: all paths through this function will call itself [-Werror,-Winfinite-recursion]
{
^
2 errors generated.

Quoted 5 lines

The underscore variants should be used here.

Fixes 63aaf6d06d87 ("iio: frequency: adrf6780: add support for ADRF6780")

Thanks Nathan, (bit embarrassed I missed this in review :(
As you probably guessed I didn't run an llvm test this time - guess I should start doing that on a regular basis.

We obviously have plenty of time to get this fix in place but seeing as I just sent a pull request for the driver a few hours before this patch:

Greg, would you mind picking this one up directly on top of [PULL] 2nd set of IIO new device support, features, cleanup for 5.16 if you take that pull request?

Message ID for this one is:

[email protected]

No problem if you'd rather I just queue this fix up for post merge window.

Thanks,

Jonathan

Quoted 28 lines
---
 drivers/iio/frequency/adrf6780.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/frequency/adrf6780.c +2 -2
index abe8b30fceca..8255ffd174f6 100644
@@ -118,7 +118,7 @@ static int adrf6780_spi_read(struct adrf6780_state *st, unsigned int reg,
 	int ret;
 
 	mutex_lock(&st->lock);
-	ret = adrf6780_spi_read(st, reg, val);
+	ret = __adrf6780_spi_read(st, reg, val);
 	mutex_unlock(&st->lock);
 
 	return ret;
@@ -139,7 +139,7 @@ static int adrf6780_spi_write(struct adrf6780_state *st, unsigned int reg,
 	int ret;
 
 	mutex_lock(&st->lock);
-	ret = adrf6780_spi_write(st, reg, val);
+	ret = __adrf6780_spi_write(st, reg, val);
 	mutex_unlock(&st->lock);
 
 	return ret;

base-commit: 77af145dc7eadcb78d38912b67d6a68050d21a9b

#2 lore raw
Quoted 33 lines · Jonathan Cameron
Quoted 12 lines · On Fri, 22 Oct 2021 12:56:56 -0700 Nathan Chancellor <[email protected]> wrote:

Clang warns:

drivers/iio/frequency/adrf6780.c:117:1: error: all paths through this function will call itself [-Werror,-Winfinite-recursion]
{
^
drivers/iio/frequency/adrf6780.c:138:1: error: all paths through this function will call itself [-Werror,-Winfinite-recursion]
{
^
2 errors generated.

Quoted 5 lines

The underscore variants should be used here.

Fixes 63aaf6d06d87 ("iio: frequency: adrf6780: add support for ADRF6780")

Thanks Nathan, (bit embarrassed I missed this in review :(
As you probably guessed I didn't run an llvm test this time - guess I should start doing that on a regular basis.

We obviously have plenty of time to get this fix in place but seeing as I just sent a pull request for the driver a few hours before this patch:

Greg, would you mind picking this one up directly on top of [PULL] 2nd set of IIO new device support, features, cleanup for 5.16 if you take that pull request?

Quoted 8 lines

Message ID for this one is:

[email protected]

No problem if you'd rather I just queue this fix up for post merge window.

Picked it up now, thanks!

greg k-h