From: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com> To: Wolfram Sang <wsa@the-dreams.de> Cc: Brendan Higgins <brendanhiggins@google.com>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Joel Stanley <joel@jms.id.au>, Andrew Jeffery <andrew@aj.id.au>, linux-i2c@vger.kernel.org, openbmc@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org, Jarkko Nikula <jarkko.nikula@linux.intel.com>, James Feist <james.feist@linux.intel.com>, Vernon Mauery <vernon.mauery@linux.intel.com> Subject: Re: [PATCH] i2c: aspeed: Add multi-master use case support Date: Mon, 11 Feb 2019 10:09:53 -0800 [thread overview] Message-ID: <d26a95ac-41ab-91eb-bbae-e4143235e531@linux.intel.com> (raw) In-Reply-To: <20190208214849.GH12451@kunai> > Hmmm, the #ifdeffery quite increases with this patch. Maybe it is easier > to select I2C_SLAVE in Kconfig? I'll let you decide. > > My code checkers found this: > > CPPCHECK > drivers/i2c/busses/i2c-aspeed.c:694:10: warning: Variable 'ret' is assigned a value that is never used. [unreadVariable] > Hi Wolfram, Yes, cppcheck pointed it out correctly. The assignment on the variable 'ret' is not needed at there. Actually, the code should not be wrapped using I2C_SLAVE because a bus can also be in multi-master environment even when slave is not enabled. So the warning can be removed by below fix. --- diff --git a/drivers/i2c/busses/i2c-aspeed.c b/drivers/i2c/busses/i2c-aspeed.c index 9253ebccb008..882c4ab1d18a 100644 --- a/drivers/i2c/busses/i2c-aspeed.c +++ b/drivers/i2c/busses/i2c-aspeed.c @@ -655,7 +655,6 @@ static int aspeed_i2c_master_xfer(struct i2c_adapter *adap, { struct aspeed_i2c_bus *bus = i2c_get_adapdata(adap); unsigned long time_left, flags; - int ret; spin_lock_irqsave(&bus->lock, flags); bus->cmd_err = 0; @@ -664,6 +663,8 @@ static int aspeed_i2c_master_xfer(struct i2c_adapter *adap, if (!bus->multi_master && (readl(bus->base + ASPEED_I2C_CMD_REG) & ASPEED_I2CD_BUS_BUSY_STS)) { + int ret; + spin_unlock_irqrestore(&bus->lock, flags); ret = aspeed_i2c_recover_bus(bus); if (ret) @@ -691,7 +692,7 @@ static int aspeed_i2c_master_xfer(struct i2c_adapter *adap, if (bus->multi_master && (readl(bus->base + ASPEED_I2C_CMD_REG) & ASPEED_I2CD_BUS_BUSY_STS)) - ret = aspeed_i2c_recover_bus(bus); + aspeed_i2c_recover_bus(bus); return -ETIMEDOUT; --- The reason of adding changes at line 658 and 667 is to remove below cppcheck warning when the change at 694 is applied. [drivers/i2c/busses/i2c-aspeed.c:670]: (style) The scope of the variable 'ret' can be reduced. Can you please apply above changes on top of this patch? Or I can submit v2 with it. Thanks, Jae
WARNING: multiple messages have this Message-ID (diff)
From: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com> To: Wolfram Sang <wsa@the-dreams.de> Cc: linux-aspeed@lists.ozlabs.org, James Feist <james.feist@linux.intel.com>, Andrew Jeffery <andrew@aj.id.au>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, openbmc@lists.ozlabs.org, Brendan Higgins <brendanhiggins@google.com>, linux-kernel@vger.kernel.org, Jarkko Nikula <jarkko.nikula@linux.intel.com>, Joel Stanley <joel@jms.id.au>, Vernon Mauery <vernon.mauery@linux.intel.com>, linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org Subject: Re: [PATCH] i2c: aspeed: Add multi-master use case support Date: Mon, 11 Feb 2019 10:09:53 -0800 [thread overview] Message-ID: <d26a95ac-41ab-91eb-bbae-e4143235e531@linux.intel.com> (raw) In-Reply-To: <20190208214849.GH12451@kunai> > Hmmm, the #ifdeffery quite increases with this patch. Maybe it is easier > to select I2C_SLAVE in Kconfig? I'll let you decide. > > My code checkers found this: > > CPPCHECK > drivers/i2c/busses/i2c-aspeed.c:694:10: warning: Variable 'ret' is assigned a value that is never used. [unreadVariable] > Hi Wolfram, Yes, cppcheck pointed it out correctly. The assignment on the variable 'ret' is not needed at there. Actually, the code should not be wrapped using I2C_SLAVE because a bus can also be in multi-master environment even when slave is not enabled. So the warning can be removed by below fix. --- diff --git a/drivers/i2c/busses/i2c-aspeed.c b/drivers/i2c/busses/i2c-aspeed.c index 9253ebccb008..882c4ab1d18a 100644 --- a/drivers/i2c/busses/i2c-aspeed.c +++ b/drivers/i2c/busses/i2c-aspeed.c @@ -655,7 +655,6 @@ static int aspeed_i2c_master_xfer(struct i2c_adapter *adap, { struct aspeed_i2c_bus *bus = i2c_get_adapdata(adap); unsigned long time_left, flags; - int ret; spin_lock_irqsave(&bus->lock, flags); bus->cmd_err = 0; @@ -664,6 +663,8 @@ static int aspeed_i2c_master_xfer(struct i2c_adapter *adap, if (!bus->multi_master && (readl(bus->base + ASPEED_I2C_CMD_REG) & ASPEED_I2CD_BUS_BUSY_STS)) { + int ret; + spin_unlock_irqrestore(&bus->lock, flags); ret = aspeed_i2c_recover_bus(bus); if (ret) @@ -691,7 +692,7 @@ static int aspeed_i2c_master_xfer(struct i2c_adapter *adap, if (bus->multi_master && (readl(bus->base + ASPEED_I2C_CMD_REG) & ASPEED_I2CD_BUS_BUSY_STS)) - ret = aspeed_i2c_recover_bus(bus); + aspeed_i2c_recover_bus(bus); return -ETIMEDOUT; --- The reason of adding changes at line 658 and 667 is to remove below cppcheck warning when the change at 694 is applied. [drivers/i2c/busses/i2c-aspeed.c:670]: (style) The scope of the variable 'ret' can be reduced. Can you please apply above changes on top of this patch? Or I can submit v2 with it. Thanks, Jae _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-02-11 18:09 UTC|newest] Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-01-16 19:39 [PATCH] i2c: aspeed: Add multi-master use case support Jae Hyun Yoo 2019-01-16 19:39 ` Jae Hyun Yoo 2019-01-31 18:20 ` Jae Hyun Yoo 2019-01-31 18:20 ` Jae Hyun Yoo 2019-02-07 19:48 ` Brendan Higgins 2019-02-07 19:48 ` Brendan Higgins 2019-02-07 19:48 ` Brendan Higgins 2019-02-08 21:48 ` Wolfram Sang 2019-02-08 21:48 ` Wolfram Sang 2019-02-11 18:09 ` Jae Hyun Yoo [this message] 2019-02-11 18:09 ` Jae Hyun Yoo 2019-02-11 18:16 ` Wolfram Sang 2019-02-11 18:16 ` Wolfram Sang 2019-02-11 18:29 ` Jae Hyun Yoo 2019-02-11 18:29 ` Jae Hyun Yoo
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=d26a95ac-41ab-91eb-bbae-e4143235e531@linux.intel.com \ --to=jae.hyun.yoo@linux.intel.com \ --cc=andrew@aj.id.au \ --cc=benh@kernel.crashing.org \ --cc=brendanhiggins@google.com \ --cc=james.feist@linux.intel.com \ --cc=jarkko.nikula@linux.intel.com \ --cc=joel@jms.id.au \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-aspeed@lists.ozlabs.org \ --cc=linux-i2c@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=openbmc@lists.ozlabs.org \ --cc=vernon.mauery@linux.intel.com \ --cc=wsa@the-dreams.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.