diff mbox

i2c: mv64xxx: really allow I2C offloading

Message ID 1445351544-26062-1-git-send-email-thomas.petazzoni@free-electrons.com
State Accepted
Headers show

Commit Message

Thomas Petazzoni Oct. 20, 2015, 2:32 p.m. UTC
From: Hezi <hezi@marvell.com>

Commit 00d8689b85a7 ("i2c: mv64xxx: rework offload support to fix
several problems") completely reworked the offload support, but
stupidly left a debugging-related "return false" at the beginning of
the mv64xxx_i2c_can_offload() function. This has the unfortunate
consequence that offloading is in fact never used, which wasn't really
the intention.

This commit fixes that problem by removing the stupid "return false".

Fixes: 00d8689b85a7 ("i2c: mv64xxx: rework offload support to fix several problems")
Cc: <stable@vger.kernel.org>
Signed-off-by: Hezi <hezi@marvell.com>
[Thomas: reworked commit log and title.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Note: the original fix is from Hezi, but I rewrote the commit log,
which is why I authorized myself to treat my own work as being
"stupid". Which it really was.
---
 drivers/i2c/busses/i2c-mv64xxx.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Wolfram Sang Oct. 20, 2015, 4:22 p.m. UTC | #1
On Tue, Oct 20, 2015 at 04:32:24PM +0200, Thomas Petazzoni wrote:
> From: Hezi <hezi@marvell.com>

Is "Hezi" the full name?

> 
> Commit 00d8689b85a7 ("i2c: mv64xxx: rework offload support to fix
> several problems") completely reworked the offload support, but
> stupidly left a debugging-related "return false" at the beginning of
> the mv64xxx_i2c_can_offload() function. This has the unfortunate
> consequence that offloading is in fact never used, which wasn't really
> the intention.
> 
> This commit fixes that problem by removing the stupid "return false".
> 
> Fixes: 00d8689b85a7 ("i2c: mv64xxx: rework offload support to fix several problems")
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Hezi <hezi@marvell.com>
> [Thomas: reworked commit log and title.]
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> Note: the original fix is from Hezi, but I rewrote the commit log,
> which is why I authorized myself to treat my own work as being
> "stupid". Which it really was.

:)

> ---
>  drivers/i2c/busses/i2c-mv64xxx.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
> index 30059c1..5801227 100644
> --- a/drivers/i2c/busses/i2c-mv64xxx.c
> +++ b/drivers/i2c/busses/i2c-mv64xxx.c
> @@ -669,8 +669,6 @@ mv64xxx_i2c_can_offload(struct mv64xxx_i2c_data *drv_data)
>  	struct i2c_msg *msgs = drv_data->msgs;
>  	int num = drv_data->num_msgs;
>  
> -	return false;
> -
>  	if (!drv_data->offload_enabled)
>  		return false;
>  
> -- 
> 2.6.2
>
Hezi Shahmoon Oct. 20, 2015, 4:56 p.m. UTC | #2
Hi.

It is:
Hezi Shahmoon

Email:
hezi@marvell.com

I will fix this for future commits.

Thanks,
Hezi.

-----Original Message-----
From: Wolfram Sang [mailto:wsa@the-dreams.de] 
Sent: Tuesday, October 20, 2015 7:22 PM
To: Thomas Petazzoni
Cc: linux-i2c@vger.kernel.org; Tawfik Bayouk; Nadav Haklai; Lior Amsalem; Jason Cooper; Andrew Lunn; Sebastian Hesselbarth; Gregory Clement; Marcin Wojtas; Hezi Shahmoon; stable@vger.kernel.org
Subject: Re: [PATCH] i2c: mv64xxx: really allow I2C offloading

On Tue, Oct 20, 2015 at 04:32:24PM +0200, Thomas Petazzoni wrote:
> From: Hezi <hezi@marvell.com>

Is "Hezi" the full name?

> 
> Commit 00d8689b85a7 ("i2c: mv64xxx: rework offload support to fix 
> several problems") completely reworked the offload support, but 
> stupidly left a debugging-related "return false" at the beginning of 
> the mv64xxx_i2c_can_offload() function. This has the unfortunate 
> consequence that offloading is in fact never used, which wasn't really 
> the intention.
> 
> This commit fixes that problem by removing the stupid "return false".
> 
> Fixes: 00d8689b85a7 ("i2c: mv64xxx: rework offload support to fix 
> several problems")
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Hezi <hezi@marvell.com>
> [Thomas: reworked commit log and title.]
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> Note: the original fix is from Hezi, but I rewrote the commit log, 
> which is why I authorized myself to treat my own work as being 
> "stupid". Which it really was.

:)

> ---
>  drivers/i2c/busses/i2c-mv64xxx.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-mv64xxx.c 
> b/drivers/i2c/busses/i2c-mv64xxx.c
> index 30059c1..5801227 100644
> --- a/drivers/i2c/busses/i2c-mv64xxx.c
> +++ b/drivers/i2c/busses/i2c-mv64xxx.c
> @@ -669,8 +669,6 @@ mv64xxx_i2c_can_offload(struct mv64xxx_i2c_data *drv_data)
>  	struct i2c_msg *msgs = drv_data->msgs;
>  	int num = drv_data->num_msgs;
>  
> -	return false;
> -
>  	if (!drv_data->offload_enabled)
>  		return false;
>  
> --
> 2.6.2
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Thomas Petazzoni Oct. 20, 2015, 5:29 p.m. UTC | #3
Hello,

On Tue, 20 Oct 2015 16:56:21 +0000, Hezi Shahmoon wrote:
> Hi.
> 
> It is:
> Hezi Shahmoon
> 
> Email:
> hezi@marvell.com

Thanks Hezi.

Wolfram, do you want me to send a v2 with Hezi's full name or will you
fix that up when applying the patch ?

Thanks,

Thomas
Wolfram Sang Oct. 21, 2015, 6:18 a.m. UTC | #4
> Wolfram, do you want me to send a v2 with Hezi's full name or will you
> fix that up when applying the patch ?

I'll fix.
Wolfram Sang Oct. 22, 2015, 12:49 p.m. UTC | #5
On Tue, Oct 20, 2015 at 04:32:24PM +0200, Thomas Petazzoni wrote:
> From: Hezi <hezi@marvell.com>
> 
> Commit 00d8689b85a7 ("i2c: mv64xxx: rework offload support to fix
> several problems") completely reworked the offload support, but
> stupidly left a debugging-related "return false" at the beginning of
> the mv64xxx_i2c_can_offload() function. This has the unfortunate
> consequence that offloading is in fact never used, which wasn't really
> the intention.
> 
> This commit fixes that problem by removing the stupid "return false".
> 
> Fixes: 00d8689b85a7 ("i2c: mv64xxx: rework offload support to fix several problems")
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Hezi <hezi@marvell.com>
> [Thomas: reworked commit log and title.]
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Applied to for-current, thanks!
diff mbox

Patch

diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 30059c1..5801227 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -669,8 +669,6 @@  mv64xxx_i2c_can_offload(struct mv64xxx_i2c_data *drv_data)
 	struct i2c_msg *msgs = drv_data->msgs;
 	int num = drv_data->num_msgs;
 
-	return false;
-
 	if (!drv_data->offload_enabled)
 		return false;