iio: adc: mcp3911: mask out device ID in debug prints

[PATCH] iio: adc: mcp3911: mask out device ID in debug prints

Posted by Marcus Folkesson 3 years, 5 months ago

The Device ID should not be included when printing register.

Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
---
 drivers/iio/adc/mcp3911.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c
index 2c1af11a621f..a71df9f3ab29 100644
--- a/drivers/iio/adc/mcp3911.c
+++ b/drivers/iio/adc/mcp3911.c
@@ -59,6 +59,7 @@
 
 #define MCP3911_REG_READ(reg, id)	((((reg) << 1) | ((id) << 6) | (1 << 0)) & 0xff)
 #define MCP3911_REG_WRITE(reg, id)	((((reg) << 1) | ((id) << 6) | (0 << 0)) & 0xff)
+#define MCP3911_REG_MASK		GENMASK(4, 1)
 
 #define MCP3911_NUM_CHANNELS		2
 #define MCP3911_NUM_SCALES		6
@@ -94,8 +95,8 @@ static int mcp3911_read(struct mcp3911 *adc, u8 reg, u32 *val, u8 len)
 
 	be32_to_cpus(val);
 	*val >>= ((4 - len) * 8);
-	dev_dbg(&adc->spi->dev, "reading 0x%x from register 0x%x\n", *val,
-		reg >> 1);
+	dev_dbg(&adc->spi->dev, "reading 0x%x from register 0x%lx\n", *val,
+		FIELD_GET(MCP3911_REG_MASK, reg));
 	return ret;
 }
 
-- 
2.37.1

Re: [PATCH] iio: adc: mcp3911: mask out device ID in debug prints

Posted by Jonathan Cameron 3 years, 5 months ago

On Mon, 10 Oct 2022 21:46:54 +0200
Marcus Folkesson <marcus.folkesson@gmail.com> wrote:

> The Device ID should not be included when printing register.
> 
> Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
Whilst obviously not super important to backport, this is a fix
so I've applied it to the fixes-togreg branch of iio.git.

Thanks,

Jonathan

> ---
>  drivers/iio/adc/mcp3911.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c
> index 2c1af11a621f..a71df9f3ab29 100644
> --- a/drivers/iio/adc/mcp3911.c
> +++ b/drivers/iio/adc/mcp3911.c
> @@ -59,6 +59,7 @@
>  
>  #define MCP3911_REG_READ(reg, id)	((((reg) << 1) | ((id) << 6) | (1 << 0)) & 0xff)
>  #define MCP3911_REG_WRITE(reg, id)	((((reg) << 1) | ((id) << 6) | (0 << 0)) & 0xff)
> +#define MCP3911_REG_MASK		GENMASK(4, 1)
>  
>  #define MCP3911_NUM_CHANNELS		2
>  #define MCP3911_NUM_SCALES		6
> @@ -94,8 +95,8 @@ static int mcp3911_read(struct mcp3911 *adc, u8 reg, u32 *val, u8 len)
>  
>  	be32_to_cpus(val);
>  	*val >>= ((4 - len) * 8);
> -	dev_dbg(&adc->spi->dev, "reading 0x%x from register 0x%x\n", *val,
> -		reg >> 1);
> +	dev_dbg(&adc->spi->dev, "reading 0x%x from register 0x%lx\n", *val,
> +		FIELD_GET(MCP3911_REG_MASK, reg));
>  	return ret;
>  }
>