diff mbox series

[drivers/i2c,1/3] i2c: amd8111: Fix coding style issues

Message ID 1617613430-11921-2-git-send-email-tiantao6@hisilicon.com
State Accepted
Commit 5e77a61f506b1ac8d86355edd52ebeb038179339
Headers show
Series Fix ERRORs reported by checkpatch | expand

Commit Message

Tian Tao April 5, 2021, 9:03 a.m. UTC 
Fix the following checkpatch errors:

  ERROR: "foo * bar" should be "foo *bar"
  #189: FILE: drivers/i2c/busses/i2c-amd8111.c:189:

  ERROR: "foo * bar" should be "foo *bar"
  #191: FILE: drivers/i2c/busses/i2c-amd8111.c:191:

  ERROR: switch and case should be at the same indent
  #201: FILE: drivers/i2c/busses/i2c-amd8111.c:201:

  ERROR: switch and case should be at the same indent
  #359: FILE: drivers/i2c/busses/i2c-amd8111.c:359:

No functional changes.

Signed-off-by: Tian Tao <tiantao6@hisilicon.com>
Signed-off-by: Zihao Tang <tangzihao1@hisilicon.com>
Cc: Jean Delvare <jdelvare@suse.com>
---
 drivers/i2c/busses/i2c-amd8111.c | 268 +++++++++++++++++++--------------------
 1 file changed, 134 insertions(+), 134 deletions(-)

Comments

Wolfram Sang April 13, 2021, 8:25 p.m. UTC | #1 
On Mon, Apr 05, 2021 at 05:03:48PM +0800, Tian Tao wrote:
> Fix the following checkpatch errors:

> 

>   ERROR: "foo * bar" should be "foo *bar"

>   #189: FILE: drivers/i2c/busses/i2c-amd8111.c:189:

> 

>   ERROR: "foo * bar" should be "foo *bar"

>   #191: FILE: drivers/i2c/busses/i2c-amd8111.c:191:

> 

>   ERROR: switch and case should be at the same indent

>   #201: FILE: drivers/i2c/busses/i2c-amd8111.c:201:

> 

>   ERROR: switch and case should be at the same indent

>   #359: FILE: drivers/i2c/busses/i2c-amd8111.c:359:

> 

> No functional changes.

> 

> Signed-off-by: Tian Tao <tiantao6@hisilicon.com>

> Signed-off-by: Zihao Tang <tangzihao1@hisilicon.com>

> Cc: Jean Delvare <jdelvare@suse.com>


Is the binary after the patch applied equal to the binary before your
patch? Same question for patch 2.
tiantao (H) April 14, 2021, 1:03 a.m. UTC | #2 
在 2021/4/14 4:25, Wolfram Sang 写道:
> On Mon, Apr 05, 2021 at 05:03:48PM +0800, Tian Tao wrote:

>> Fix the following checkpatch errors:

>>

>>    ERROR: "foo * bar" should be "foo *bar"

>>    #189: FILE: drivers/i2c/busses/i2c-amd8111.c:189:

>>

>>    ERROR: "foo * bar" should be "foo *bar"

>>    #191: FILE: drivers/i2c/busses/i2c-amd8111.c:191:

>>

>>    ERROR: switch and case should be at the same indent

>>    #201: FILE: drivers/i2c/busses/i2c-amd8111.c:201:

>>

>>    ERROR: switch and case should be at the same indent

>>    #359: FILE: drivers/i2c/busses/i2c-amd8111.c:359:

>>

>> No functional changes.

>>

>> Signed-off-by: Tian Tao <tiantao6@hisilicon.com>

>> Signed-off-by: Zihao Tang <tangzihao1@hisilicon.com>

>> Cc: Jean Delvare <jdelvare@suse.com>

> Is the binary after the patch applied equal to the binary before your

> patch? Same question for patch 2.


The MD5 value of binary is the same before and after the patch is 
merged，the log is as below：

tiantao@ubuntu:~/mailline/linux-next$ md5sum 
drivers/i2c/busses//i2c-amd8111.o

d1d2a43e4a6166f127e47c494b9bef1c  drivers/i2c/busses//i2c-amd8111.o
tiantao@ubuntu:~/mailline/linux-next$ git am 
/home/tiantao/i2c/0004-i2c-amd8111-Fix-coding-style-issues.patch
Applying: i2c: amd8111: Fix coding style issues
tiantao@ubuntu:~/mailline/linux-next$ make modules M=drivers/i2c/busses/
   CC [M]  drivers/i2c/busses//i2c-amd8111.o
   MODPOST drivers/i2c/busses//Module.symvers
   LD [M]  drivers/i2c/busses//i2c-amd8111.ko
tiantao@ubuntu:~/mailline/linux-next$ md5sum 
drivers/i2c/busses//i2c-amd8111.o
d1d2a43e4a6166f127e47c494b9bef1c  drivers/i2c/busses//i2c-amd8111.o
Wolfram Sang April 14, 2021, 8:31 a.m. UTC | #3 
> > Is the binary after the patch applied equal to the binary before your

> > patch? Same question for patch 2.

> 

> The MD5 value of binary is the same before and after the patch is

> merged，the log is as below：


Thanks for checking! What about patch 2?
tiantao (H) April 14, 2021, 8:40 a.m. UTC | #4 
在 2021/4/14 16:31, Wolfram Sang 写道:
>>> Is the binary after the patch applied equal to the binary before your

>>> patch? Same question for patch 2.

>> The MD5 value of binary is the same before and after the patch is

>> merged，the log is as below：

> Thanks for checking! What about patch 2?


The MD5 value of binary is the same before and after the patch2 is
merged，the log is as below：

tiantao@ubuntu:~/mailline/linux-next$ make modules M=drivers/i2c/busses/
   CC [M]  drivers/i2c/busses//i2c-iop3xx.o
   MODPOST drivers/i2c/busses//Module.symvers
   CC [M]  drivers/i2c/busses//i2c-iop3xx.mod.o
   LD [M]  drivers/i2c/busses//i2c-iop3xx.ko
tiantao@ubuntu:~/mailline/linux-next$ md5sum 
drivers/i2c/busses//i2c-iop3xx.o
6c1b7bdd1fa8bb372eee04344e496617  drivers/i2c/busses//i2c-iop3xx.o
tiantao@ubuntu:~/mailline/linux-next$ git am 
/home/tiantao/patchi3c/0002-i2c-iop3xx-Fix-coding-style-issues.patch
Applying: i2c: iop3xx: Fix coding style issues
tiantao@ubuntu:~/mailline/linux-next$ make modules M=drivers/i2c/busses/
   CC [M]  drivers/i2c/busses//i2c-iop3xx.o
   MODPOST drivers/i2c/busses//Module.symvers
   LD [M]  drivers/i2c/busses//i2c-iop3xx.ko
tiantao@ubuntu:~/mailline/linux-next$ md5sum 
drivers/i2c/busses//i2c-iop3xx.o
6c1b7bdd1fa8bb372eee04344e496617  drivers/i2c/busses//i2c-iop3xx.o

>
Wolfram Sang April 15, 2021, 8:26 p.m. UTC | #5 
On Mon, Apr 05, 2021 at 05:03:48PM +0800, Tian Tao wrote:
> Fix the following checkpatch errors:

> 

>   ERROR: "foo * bar" should be "foo *bar"

>   #189: FILE: drivers/i2c/busses/i2c-amd8111.c:189:

> 

>   ERROR: "foo * bar" should be "foo *bar"

>   #191: FILE: drivers/i2c/busses/i2c-amd8111.c:191:

> 

>   ERROR: switch and case should be at the same indent

>   #201: FILE: drivers/i2c/busses/i2c-amd8111.c:201:

> 

>   ERROR: switch and case should be at the same indent

>   #359: FILE: drivers/i2c/busses/i2c-amd8111.c:359:

> 

> No functional changes.

> 

> Signed-off-by: Tian Tao <tiantao6@hisilicon.com>

> Signed-off-by: Zihao Tang <tangzihao1@hisilicon.com>

> Cc: Jean Delvare <jdelvare@suse.com>


Applied to for-next, thanks!
diff mbox series

Patch

diff --git a/drivers/i2c/busses/i2c-amd8111.c b/drivers/i2c/busses/i2c-amd8111.c
index 34862ad..1ed7e94 100644
--- a/drivers/i2c/busses/i2c-amd8111.c
+++ b/drivers/i2c/busses/i2c-amd8111.c
@@ -186,9 +186,9 @@  static int amd_ec_write(struct amd_smbus *smbus, unsigned char address,
 #define AMD_SMB_PRTCL_PEC		0x80
 
 
-static s32 amd8111_access(struct i2c_adapter * adap, u16 addr,
+static s32 amd8111_access(struct i2c_adapter *adap, u16 addr,
 		unsigned short flags, char read_write, u8 command, int size,
-		union i2c_smbus_data * data)
+		union i2c_smbus_data *data)
 {
 	struct amd_smbus *smbus = adap->algo_data;
 	unsigned char protocol, len, pec, temp[2];
@@ -199,130 +199,130 @@  static s32 amd8111_access(struct i2c_adapter * adap, u16 addr,
 	pec = (flags & I2C_CLIENT_PEC) ? AMD_SMB_PRTCL_PEC : 0;
 
 	switch (size) {
-		case I2C_SMBUS_QUICK:
-			protocol |= AMD_SMB_PRTCL_QUICK;
-			read_write = I2C_SMBUS_WRITE;
-			break;
-
-		case I2C_SMBUS_BYTE:
-			if (read_write == I2C_SMBUS_WRITE) {
-				status = amd_ec_write(smbus, AMD_SMB_CMD,
-						      command);
-				if (status)
-					return status;
-			}
-			protocol |= AMD_SMB_PRTCL_BYTE;
-			break;
-
-		case I2C_SMBUS_BYTE_DATA:
-			status = amd_ec_write(smbus, AMD_SMB_CMD, command);
+	case I2C_SMBUS_QUICK:
+		protocol |= AMD_SMB_PRTCL_QUICK;
+		read_write = I2C_SMBUS_WRITE;
+		break;
+
+	case I2C_SMBUS_BYTE:
+		if (read_write == I2C_SMBUS_WRITE) {
+			status = amd_ec_write(smbus, AMD_SMB_CMD,
+						command);
 			if (status)
 				return status;
-			if (read_write == I2C_SMBUS_WRITE) {
-				status = amd_ec_write(smbus, AMD_SMB_DATA,
-						      data->byte);
-				if (status)
-					return status;
-			}
-			protocol |= AMD_SMB_PRTCL_BYTE_DATA;
-			break;
+		}
+		protocol |= AMD_SMB_PRTCL_BYTE;
+		break;
 
-		case I2C_SMBUS_WORD_DATA:
-			status = amd_ec_write(smbus, AMD_SMB_CMD, command);
+	case I2C_SMBUS_BYTE_DATA:
+		status = amd_ec_write(smbus, AMD_SMB_CMD, command);
+		if (status)
+			return status;
+		if (read_write == I2C_SMBUS_WRITE) {
+			status = amd_ec_write(smbus, AMD_SMB_DATA,
+						data->byte);
 			if (status)
 				return status;
-			if (read_write == I2C_SMBUS_WRITE) {
-				status = amd_ec_write(smbus, AMD_SMB_DATA,
-						      data->word & 0xff);
-				if (status)
-					return status;
-				status = amd_ec_write(smbus, AMD_SMB_DATA + 1,
-						      data->word >> 8);
-				if (status)
-					return status;
-			}
-			protocol |= AMD_SMB_PRTCL_WORD_DATA | pec;
-			break;
+		}
+		protocol |= AMD_SMB_PRTCL_BYTE_DATA;
+		break;
 
-		case I2C_SMBUS_BLOCK_DATA:
-			status = amd_ec_write(smbus, AMD_SMB_CMD, command);
-			if (status)
-				return status;
-			if (read_write == I2C_SMBUS_WRITE) {
-				len = min_t(u8, data->block[0],
-					    I2C_SMBUS_BLOCK_MAX);
-				status = amd_ec_write(smbus, AMD_SMB_BCNT, len);
-				if (status)
-					return status;
-				for (i = 0; i < len; i++) {
-					status =
-					  amd_ec_write(smbus, AMD_SMB_DATA + i,
-						       data->block[i + 1]);
-					if (status)
-						return status;
-				}
-			}
-			protocol |= AMD_SMB_PRTCL_BLOCK_DATA | pec;
-			break;
-
-		case I2C_SMBUS_I2C_BLOCK_DATA:
-			len = min_t(u8, data->block[0],
-				    I2C_SMBUS_BLOCK_MAX);
-			status = amd_ec_write(smbus, AMD_SMB_CMD, command);
-			if (status)
-				return status;
-			status = amd_ec_write(smbus, AMD_SMB_BCNT, len);
-			if (status)
-				return status;
-			if (read_write == I2C_SMBUS_WRITE)
-				for (i = 0; i < len; i++) {
-					status =
-					  amd_ec_write(smbus, AMD_SMB_DATA + i,
-						       data->block[i + 1]);
-					if (status)
-						return status;
-				}
-			protocol |= AMD_SMB_PRTCL_I2C_BLOCK_DATA;
-			break;
-
-		case I2C_SMBUS_PROC_CALL:
-			status = amd_ec_write(smbus, AMD_SMB_CMD, command);
-			if (status)
-				return status;
+	case I2C_SMBUS_WORD_DATA:
+		status = amd_ec_write(smbus, AMD_SMB_CMD, command);
+		if (status)
+			return status;
+		if (read_write == I2C_SMBUS_WRITE) {
 			status = amd_ec_write(smbus, AMD_SMB_DATA,
-					      data->word & 0xff);
+						data->word & 0xff);
 			if (status)
 				return status;
 			status = amd_ec_write(smbus, AMD_SMB_DATA + 1,
-					      data->word >> 8);
+						data->word >> 8);
 			if (status)
 				return status;
-			protocol = AMD_SMB_PRTCL_PROC_CALL | pec;
-			read_write = I2C_SMBUS_READ;
-			break;
+		}
+		protocol |= AMD_SMB_PRTCL_WORD_DATA | pec;
+		break;
 
-		case I2C_SMBUS_BLOCK_PROC_CALL:
+	case I2C_SMBUS_BLOCK_DATA:
+		status = amd_ec_write(smbus, AMD_SMB_CMD, command);
+		if (status)
+			return status;
+		if (read_write == I2C_SMBUS_WRITE) {
 			len = min_t(u8, data->block[0],
-				    I2C_SMBUS_BLOCK_MAX - 1);
-			status = amd_ec_write(smbus, AMD_SMB_CMD, command);
-			if (status)
-				return status;
+					I2C_SMBUS_BLOCK_MAX);
 			status = amd_ec_write(smbus, AMD_SMB_BCNT, len);
 			if (status)
 				return status;
 			for (i = 0; i < len; i++) {
-				status = amd_ec_write(smbus, AMD_SMB_DATA + i,
-						      data->block[i + 1]);
+				status =
+					amd_ec_write(smbus, AMD_SMB_DATA + i,
+						data->block[i + 1]);
 				if (status)
 					return status;
 			}
-			protocol = AMD_SMB_PRTCL_BLOCK_PROC_CALL | pec;
-			read_write = I2C_SMBUS_READ;
-			break;
+		}
+		protocol |= AMD_SMB_PRTCL_BLOCK_DATA | pec;
+		break;
+
+	case I2C_SMBUS_I2C_BLOCK_DATA:
+		len = min_t(u8, data->block[0],
+				I2C_SMBUS_BLOCK_MAX);
+		status = amd_ec_write(smbus, AMD_SMB_CMD, command);
+		if (status)
+			return status;
+		status = amd_ec_write(smbus, AMD_SMB_BCNT, len);
+		if (status)
+			return status;
+		if (read_write == I2C_SMBUS_WRITE)
+			for (i = 0; i < len; i++) {
+				status =
+					amd_ec_write(smbus, AMD_SMB_DATA + i,
+						data->block[i + 1]);
+				if (status)
+					return status;
+			}
+		protocol |= AMD_SMB_PRTCL_I2C_BLOCK_DATA;
+		break;
 
-		default:
-			dev_warn(&adap->dev, "Unsupported transaction %d\n", size);
-			return -EOPNOTSUPP;
+	case I2C_SMBUS_PROC_CALL:
+		status = amd_ec_write(smbus, AMD_SMB_CMD, command);
+		if (status)
+			return status;
+		status = amd_ec_write(smbus, AMD_SMB_DATA,
+					data->word & 0xff);
+		if (status)
+			return status;
+		status = amd_ec_write(smbus, AMD_SMB_DATA + 1,
+					data->word >> 8);
+		if (status)
+			return status;
+		protocol = AMD_SMB_PRTCL_PROC_CALL | pec;
+		read_write = I2C_SMBUS_READ;
+		break;
+
+	case I2C_SMBUS_BLOCK_PROC_CALL:
+		len = min_t(u8, data->block[0],
+				I2C_SMBUS_BLOCK_MAX - 1);
+		status = amd_ec_write(smbus, AMD_SMB_CMD, command);
+		if (status)
+			return status;
+		status = amd_ec_write(smbus, AMD_SMB_BCNT, len);
+		if (status)
+			return status;
+		for (i = 0; i < len; i++) {
+			status = amd_ec_write(smbus, AMD_SMB_DATA + i,
+						data->block[i + 1]);
+			if (status)
+				return status;
+		}
+		protocol = AMD_SMB_PRTCL_BLOCK_PROC_CALL | pec;
+		read_write = I2C_SMBUS_READ;
+		break;
+
+	default:
+		dev_warn(&adap->dev, "Unsupported transaction %d\n", size);
+		return -EOPNOTSUPP;
 	}
 
 	status = amd_ec_write(smbus, AMD_SMB_ADDR, addr << 1);
@@ -357,40 +357,40 @@  static s32 amd8111_access(struct i2c_adapter * adap, u16 addr,
 		return 0;
 
 	switch (size) {
-		case I2C_SMBUS_BYTE:
-		case I2C_SMBUS_BYTE_DATA:
-			status = amd_ec_read(smbus, AMD_SMB_DATA, &data->byte);
-			if (status)
-				return status;
-			break;
+	case I2C_SMBUS_BYTE:
+	case I2C_SMBUS_BYTE_DATA:
+		status = amd_ec_read(smbus, AMD_SMB_DATA, &data->byte);
+		if (status)
+			return status;
+		break;
 
-		case I2C_SMBUS_WORD_DATA:
-		case I2C_SMBUS_PROC_CALL:
-			status = amd_ec_read(smbus, AMD_SMB_DATA, temp + 0);
-			if (status)
-				return status;
-			status = amd_ec_read(smbus, AMD_SMB_DATA + 1, temp + 1);
-			if (status)
-				return status;
-			data->word = (temp[1] << 8) | temp[0];
-			break;
+	case I2C_SMBUS_WORD_DATA:
+	case I2C_SMBUS_PROC_CALL:
+		status = amd_ec_read(smbus, AMD_SMB_DATA, temp + 0);
+		if (status)
+			return status;
+		status = amd_ec_read(smbus, AMD_SMB_DATA + 1, temp + 1);
+		if (status)
+			return status;
+		data->word = (temp[1] << 8) | temp[0];
+		break;
 
-		case I2C_SMBUS_BLOCK_DATA:
-		case I2C_SMBUS_BLOCK_PROC_CALL:
-			status = amd_ec_read(smbus, AMD_SMB_BCNT, &len);
+	case I2C_SMBUS_BLOCK_DATA:
+	case I2C_SMBUS_BLOCK_PROC_CALL:
+		status = amd_ec_read(smbus, AMD_SMB_BCNT, &len);
+		if (status)
+			return status;
+		len = min_t(u8, len, I2C_SMBUS_BLOCK_MAX);
+		fallthrough;
+	case I2C_SMBUS_I2C_BLOCK_DATA:
+		for (i = 0; i < len; i++) {
+			status = amd_ec_read(smbus, AMD_SMB_DATA + i,
+						data->block + i + 1);
 			if (status)
 				return status;
-			len = min_t(u8, len, I2C_SMBUS_BLOCK_MAX);
-			fallthrough;
-		case I2C_SMBUS_I2C_BLOCK_DATA:
-			for (i = 0; i < len; i++) {
-				status = amd_ec_read(smbus, AMD_SMB_DATA + i,
-						     data->block + i + 1);
-				if (status)
-					return status;
-			}
-			data->block[0] = len;
-			break;
+		}
+		data->block[0] = len;
+		break;
 	}
 
 	return 0;