pm_smbus: rename variable to avoid shadowing

[PATCH] pm_smbus: rename variable to avoid shadowing

Paolo Bonzini posted 1 patch 7 months, 1 week ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20230925144744.527958-2-pbonzini@redhat.com

Maintainers: "Michael S. Tsirkin" <mst@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>

hw/i2c/pm_smbus.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Expand all Fold all

[PATCH] pm_smbus: rename variable to avoid shadowing

Posted by Paolo Bonzini 7 months, 1 week ago

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/i2c/pm_smbus.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c
index 9ad6a47739b..4e1b8a5182d 100644
--- a/hw/i2c/pm_smbus.c
+++ b/hw/i2c/pm_smbus.c
@@ -279,7 +279,7 @@ static void smb_ioport_writeb(void *opaque, hwaddr addr, uint64_t val,
             if (!read && s->smb_index == s->smb_data0) {
                 uint8_t prot = (s->smb_ctl >> 2) & 0x07;
                 uint8_t cmd = s->smb_cmd;
-                uint8_t addr = s->smb_addr >> 1;
+                uint8_t smb_addr = s->smb_addr >> 1;
                 int ret;
 
                 if (prot == PROT_I2C_BLOCK_READ) {
@@ -287,7 +287,7 @@ static void smb_ioport_writeb(void *opaque, hwaddr addr, uint64_t val,
                     goto out;
                 }
 
-                ret = smbus_write_block(s->smbus, addr, cmd, s->smb_data,
+                ret = smbus_write_block(s->smbus, smb_addr, cmd, s->smb_data,
                                         s->smb_data0, !s->i2c_enable);
                 if (ret < 0) {
                     s->smb_stat |= STS_DEV_ERR;
-- 
2.41.0

Re: [PATCH] pm_smbus: rename variable to avoid shadowing

Posted by Corey Minyard 7 months, 1 week ago

On Mon, Sep 25, 2023 at 04:47:39PM +0200, Paolo Bonzini wrote:
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  hw/i2c/pm_smbus.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

This looks ok to me.

Acked-by: Corey Minyard <cminyard@mvista.com>

> 
> diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c
> index 9ad6a47739b..4e1b8a5182d 100644
> --- a/hw/i2c/pm_smbus.c
> +++ b/hw/i2c/pm_smbus.c
> @@ -279,7 +279,7 @@ static void smb_ioport_writeb(void *opaque, hwaddr addr, uint64_t val,
>              if (!read && s->smb_index == s->smb_data0) {
>                  uint8_t prot = (s->smb_ctl >> 2) & 0x07;
>                  uint8_t cmd = s->smb_cmd;
> -                uint8_t addr = s->smb_addr >> 1;
> +                uint8_t smb_addr = s->smb_addr >> 1;
>                  int ret;
>  
>                  if (prot == PROT_I2C_BLOCK_READ) {
> @@ -287,7 +287,7 @@ static void smb_ioport_writeb(void *opaque, hwaddr addr, uint64_t val,
>                      goto out;
>                  }
>  
> -                ret = smbus_write_block(s->smbus, addr, cmd, s->smb_data,
> +                ret = smbus_write_block(s->smbus, smb_addr, cmd, s->smb_data,
>                                          s->smb_data0, !s->i2c_enable);
>                  if (ret < 0) {
>                      s->smb_stat |= STS_DEV_ERR;
> -- 
> 2.41.0
> 
>