From: Nicholas Mc Guire <der.herr@hofr.at>
To: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Cc: Nicholas Mc Guire <hofrat@osadl.org>,
Wolfram Sang <wsa@the-dreams.de>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Jisheng Zhang <jszhang@marvell.com>,
Du Wenkai <wenkai.du@intel.com>,
Shinya Kuribayashi <skuribay@pobox.com>,
Romain Baeriswyl <Romain.Baeriswyl@abilis.com>,
Andrew Jackson <Andrew.Jackson@arm.com>,
David Box <david.e.box@linux.intel.com>,
linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] i2c-designware: fixup of wait_for_completion_timeout return handling
Date: Tue, 10 Feb 2015 08:59:04 +0100 [thread overview]
Message-ID: <20150210075904.GC32478@opentech.at> (raw)
In-Reply-To: <54D9B0E8.7000000@linux.intel.com>
On Tue, 10 Feb 2015, Jarkko Nikula wrote:
> Hi
>
> On 02/09/2015 06:35 PM, Nicholas Mc Guire wrote:
>> return type of wait_for_completion_timeout is unsigned long not int.
>> An appropriate return variable is introduced and assignment fixed up.
>>
>> Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
>> ---
>>
>> Patch was compile tested with x86_64_defconfig +
>> CONFIG_X86_AMD_PLATFORM_DEVICE=y, CONFIG_I2C_DESIGNWARE_PLATFORM=m
>> (implies CONFIG_I2C_DESIGNWARE_CORE=y)
>>
>> Patch is against 3.19.0-rc7 (localversion-next is -next-20150209)
>>
>> drivers/i2c/busses/i2c-designware-core.c | 5 +++--
>> 1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/i2c/busses/i2c-designware-core.c b/drivers/i2c/busses/i2c-designware-core.c
>> index 6e25c01..05934e0 100644
>> --- a/drivers/i2c/busses/i2c-designware-core.c
>> +++ b/drivers/i2c/busses/i2c-designware-core.c
>> @@ -623,6 +623,7 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
>> {
>> struct dw_i2c_dev *dev = i2c_get_adapdata(adap);
>> int ret;
>> + unsigned int timeout;
>>
> Not unsigned long.
oops thats braindead - yes of course unsigned long
sorry - thats a careless mistake.
>
>> @@ -656,8 +657,8 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
>> i2c_dw_xfer_init(dev);
>>
>> /* wait for tx to complete */
>> - ret = wait_for_completion_timeout(&dev->cmd_complete, HZ);
>> - if (ret == 0) {
>> + timeout = wait_for_completion_timeout(&dev->cmd_complete, HZ);
>> + if (timeout == 0) {
>> dev_err(dev->dev, "controller timed out\n");
>> /* i2c_dw_init implicitly disables the adapter */
>> i2c_dw_init(dev);
>>
> I'd say better to test directly with "if
> (!wait_for_completion_timeout())" since remaining jiffies or potential
> error code from wait_for_completion_timeout() is not used here.
>
Yup - that would eliminate the need for an additional variable
but some maintainers did not like that solution.
Thanks for your comments - Will fix it up and repost.
thx!
hofrat
prev parent reply other threads:[~2015-02-10 7:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-09 16:35 [PATCH] i2c-designware: fixup of wait_for_completion_timeout return handling Nicholas Mc Guire
2015-02-10 7:19 ` Jarkko Nikula
2015-02-10 7:59 ` Nicholas Mc Guire [this message]
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=20150210075904.GC32478@opentech.at \
--to=der.herr@hofr.at \
--cc=Andrew.Jackson@arm.com \
--cc=Romain.Baeriswyl@abilis.com \
--cc=david.e.box@linux.intel.com \
--cc=hofrat@osadl.org \
--cc=jarkko.nikula@linux.intel.com \
--cc=jszhang@marvell.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=skuribay@pobox.com \
--cc=wenkai.du@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox