{"id":1936192,"url":"http://patchwork.ozlabs.org/api/patches/1936192/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-aspeed/patch/20240516181907.3468796-28-eajames@linux.ibm.com/","project":{"id":57,"url":"http://patchwork.ozlabs.org/api/projects/57/?format=json","name":"Linux ASPEED SoC development","link_name":"linux-aspeed","list_id":"linux-aspeed.lists.ozlabs.org","list_email":"linux-aspeed@lists.ozlabs.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20240516181907.3468796-28-eajames@linux.ibm.com>","list_archive_url":null,"date":"2024-05-16T18:18:54","name":"[v3,27/40] i2c: fsi: Improve formatting","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b65a0e2aeabb9e8a792c144e601b2a99d7a38aab","submitter":{"id":74989,"url":"http://patchwork.ozlabs.org/api/people/74989/?format=json","name":"Eddie James","email":"eajames@linux.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-aspeed/patch/20240516181907.3468796-28-eajames@linux.ibm.com/mbox/","series":[{"id":407101,"url":"http://patchwork.ozlabs.org/api/series/407101/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-aspeed/list/?series=407101","date":"2024-05-16T18:18:31","name":"fsi: Add interrupt support","version":3,"mbox":"http://patchwork.ozlabs.org/series/407101/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1936192/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1936192/checks/","tags":{},"related":[],"headers":{"Return-Path":"\n ","X-Original-To":["incoming@patchwork.ozlabs.org","linux-aspeed@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@legolas.ozlabs.org","linux-aspeed@lists.ozlabs.org"],"Authentication-Results":["legolas.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256\n header.s=pp1 header.b=KAAEOMHx;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org\n (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org;\n envelope-from=linux-aspeed-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org;\n receiver=patchwork.ozlabs.org)","lists.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256\n header.s=pp1 header.b=KAAEOMHx;\n\tdkim-atps=neutral","lists.ozlabs.org;\n dmarc=pass (p=none dis=none) header.from=linux.ibm.com","lists.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256\n header.s=pp1 header.b=KAAEOMHx;\n\tdkim-atps=neutral","lists.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=linux.ibm.com\n (client-ip=148.163.158.5; helo=mx0b-001b2d01.pphosted.com;\n envelope-from=eajames@linux.ibm.com; receiver=lists.ozlabs.org)"],"Received":["from lists.ozlabs.org (lists.ozlabs.org\n [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature ECDSA (secp384r1))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4VgJNy5h2Dz1yfq\n\tfor ; Fri, 17 May 2024 04:22:58 +1000 (AEST)","from boromir.ozlabs.org (localhost [IPv6:::1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4VgJNy3WM2z3fpD\n\tfor ; Fri, 17 May 2024 04:22:58 +1000 (AEST)","from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com\n [148.163.158.5])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 4VgJKZ4Fczz3fnZ;\n\tFri, 17 May 2024 04:20:02 +1000 (AEST)","from pps.filterd (m0353725.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id\n 44GHPT8N028543;\n\tThu, 16 May 2024 18:19:20 GMT","from ppma11.dal12v.mail.ibm.com\n (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219])\n\tby mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3y5mce8frs-1\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n\tThu, 16 May 2024 18:19:20 +0000","from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1])\n\tby ppma11.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id\n 44GFouQm005504;\n\tThu, 16 May 2024 18:19:19 GMT","from smtprelay02.dal12v.mail.ibm.com ([172.16.1.4])\n\tby ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 3y2nq331w5-1\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n\tThu, 16 May 2024 18:19:19 +0000","from smtpav05.dal12v.mail.ibm.com (smtpav05.dal12v.mail.ibm.com\n [10.241.53.104])\n\tby smtprelay02.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id\n 44GIJHoh25690414\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n\tThu, 16 May 2024 18:19:19 GMT","from smtpav05.dal12v.mail.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id A5EA85806E;\n\tThu, 16 May 2024 18:19:15 +0000 (GMT)","from smtpav05.dal12v.mail.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 61CC758088;\n\tThu, 16 May 2024 18:19:15 +0000 (GMT)","from slate16.aus.stglabs.ibm.com (unknown [9.61.107.19])\n\tby smtpav05.dal12v.mail.ibm.com (Postfix) with ESMTP;\n\tThu, 16 May 2024 18:19:15 +0000 (GMT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com;\n h=from : to : cc : subject\n : date : message-id : in-reply-to : references : mime-version :\n content-transfer-encoding; s=pp1;\n bh=sExpzqDawVL7Dn962NZ99fpWpjztnGoo0REU8wYGdnY=;\n b=KAAEOMHxv246WxOQrRyEIoI/h6USV0nnwmoSXmL9hZWzPMxPn3QKeeaH5HCWkccciEiT\n ls3iQeZP/2X28Xw3k52pyE6rwqPvFwLCN9MErIaUWdhdF7EHLmU0UyG6Thgb9VALRxxP\n 6TyxSXe9YEDiS+Z/Rfik9YZN7H7ylIqkotzPJZ7zuKAQFx/+o1fPZCMwK5gd35hv8mnv\n v7ejz6KfNKvRJW3BJZbGQn42OXXdKwDPEeJqumYYav1Ua08e4YW99r0O8Pwwh3RkOq/b\n tKVoDB6ke3EJAtu2O8NgnuKExpLkQ1Wo8HpiYNGEkIyNPdS9sP7Mpe3YMYhVq357GsCp dA==","From":"Eddie James ","To":"linux-fsi@lists.ozlabs.org","Subject":"[PATCH v3 27/40] i2c: fsi: Improve formatting","Date":"Thu, 16 May 2024 13:18:54 -0500","Message-Id":"<20240516181907.3468796-28-eajames@linux.ibm.com>","X-Mailer":"git-send-email 2.39.3","In-Reply-To":"<20240516181907.3468796-1-eajames@linux.ibm.com>","References":"<20240516181907.3468796-1-eajames@linux.ibm.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-TM-AS-GCONF":"00","X-Proofpoint-GUID":"aqRpYjFwElhVD6tKl4zd51PHoqBqm-2N","X-Proofpoint-ORIG-GUID":"aqRpYjFwElhVD6tKl4zd51PHoqBqm-2N","X-Proofpoint-Virus-Version":"vendor=baseguard\n engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.11.176.26\n definitions=2024-05-16_07,2024-05-15_01,2023-05-22_02","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n mlxlogscore=999 phishscore=0\n adultscore=0 priorityscore=1501 malwarescore=0 suspectscore=0 bulkscore=0\n mlxscore=0 spamscore=0 lowpriorityscore=0 impostorscore=0 clxscore=1015\n classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000\n definitions=main-2405160132","X-BeenThere":"linux-aspeed@lists.ozlabs.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"Linux ASPEED SoC development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Cc":"andi.shyti@kernel.org, linux-aspeed@lists.ozlabs.org, jk@ozlabs.org,\n alistair@popple.id.au, linux-kernel@vger.kernel.org,\n linux-spi@vger.kernel.org, broonie@kernel.org, andrew@codeconstruct.com.au,\n linux-i2c@vger.kernel.org","Errors-To":"linux-aspeed-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org","Sender":"\"Linux-aspeed\"\n "},"content":"No functional change. Remove holes in the master structure. Re-order\nlocal variables to look pretty. Remove some local variables in favor of\nusing their containing structure.\n\nSigned-off-by: Eddie James \n---\nChanges since v2:\n - Add detail to commit message.\n\n drivers/i2c/busses/i2c-fsi.c | 125 +++++++++++++++++------------------\n 1 file changed, 60 insertions(+), 65 deletions(-)","diff":"diff --git a/drivers/i2c/busses/i2c-fsi.c b/drivers/i2c/busses/i2c-fsi.c\nindex 2404ace8c56fa..8fb5b51b74a4d 100644\n--- a/drivers/i2c/busses/i2c-fsi.c\n+++ b/drivers/i2c/busses/i2c-fsi.c\n@@ -148,10 +148,10 @@\n \n struct fsi_i2c_master {\n \tstruct fsi_device\t*fsi;\n-\tu8\t\t\tfifo_size;\n \tstruct list_head\tports;\n \tstruct mutex\t\tlock;\n \tu32\t\t\tclock_div;\n+\tu8\t\t\tfifo_size;\n };\n \n struct fsi_i2c_port {\n@@ -165,15 +165,14 @@ struct fsi_i2c_port {\n static int fsi_i2c_read_reg(struct fsi_device *fsi, unsigned int reg,\n \t\t\t u32 *data)\n {\n-\tint rc;\n \t__be32 data_be;\n+\tint rc;\n \n \trc = fsi_device_read(fsi, reg, &data_be, sizeof(data_be));\n \tif (rc)\n \t\treturn rc;\n \n \t*data = be32_to_cpu(data_be);\n-\n \treturn 0;\n }\n \n@@ -187,9 +186,11 @@ static int fsi_i2c_write_reg(struct fsi_device *fsi, unsigned int reg,\n \n static int fsi_i2c_dev_init(struct fsi_i2c_master *i2c)\n {\n-\tint rc;\n-\tu32 mode = I2C_MODE_ENHANCED, extended_status, watermark;\n+\tu32 mode = I2C_MODE_ENHANCED;\n+\tu32 extended_status;\n \tu32 interrupt = 0;\n+\tu32 watermark;\n+\tint rc;\n \n \t/* since we use polling, disable interrupts */\n \trc = fsi_i2c_write_reg(i2c->fsi, I2C_FSI_INT_MASK, &interrupt);\n@@ -215,9 +216,10 @@ static int fsi_i2c_dev_init(struct fsi_i2c_master *i2c)\n \n static int fsi_i2c_set_port(struct fsi_i2c_port *port)\n {\n-\tint rc;\n \tstruct fsi_device *fsi = port->master->fsi;\n-\tu32 mode, dummy = 0;\n+\tu32 dummy = 0;\n+\tu32 mode;\n+\tint rc;\n \n \trc = fsi_i2c_read_reg(fsi, I2C_FSI_MODE, &mode);\n \tif (rc)\n@@ -238,7 +240,6 @@ static int fsi_i2c_set_port(struct fsi_i2c_port *port)\n static int fsi_i2c_start(struct fsi_i2c_port *port, struct i2c_msg *msg,\n \t\t\t bool stop)\n {\n-\tstruct fsi_i2c_master *i2c = port->master;\n \tu32 cmd = I2C_CMD_WITH_START | I2C_CMD_WITH_ADDR;\n \n \tport->xfrd = 0;\n@@ -252,7 +253,7 @@ static int fsi_i2c_start(struct fsi_i2c_port *port, struct i2c_msg *msg,\n \tcmd |= FIELD_PREP(I2C_CMD_ADDR, msg->addr);\n \tcmd |= FIELD_PREP(I2C_CMD_LEN, msg->len);\n \n-\treturn fsi_i2c_write_reg(i2c->fsi, I2C_FSI_CMD, &cmd);\n+\treturn fsi_i2c_write_reg(port->master->fsi, I2C_FSI_CMD, &cmd);\n }\n \n static int fsi_i2c_get_op_bytes(int op_bytes)\n@@ -268,18 +269,17 @@ static int fsi_i2c_get_op_bytes(int op_bytes)\n static int fsi_i2c_write_fifo(struct fsi_i2c_port *port, struct i2c_msg *msg,\n \t\t\t u8 fifo_count)\n {\n+\tint bytes_to_write = port->master->fifo_size - fifo_count;\n+\tint bytes_remaining = msg->len - port->xfrd;\n \tint write;\n \tint rc;\n-\tstruct fsi_i2c_master *i2c = port->master;\n-\tint bytes_to_write = i2c->fifo_size - fifo_count;\n-\tint bytes_remaining = msg->len - port->xfrd;\n \n \tbytes_to_write = min(bytes_to_write, bytes_remaining);\n \n \twhile (bytes_to_write) {\n \t\twrite = fsi_i2c_get_op_bytes(bytes_to_write);\n \n-\t\trc = fsi_device_write(i2c->fsi, I2C_FSI_FIFO,\n+\t\trc = fsi_device_write(port->master->fsi, I2C_FSI_FIFO,\n \t\t\t\t &msg->buf[port->xfrd], write);\n \t\tif (rc)\n \t\t\treturn rc;\n@@ -294,12 +294,11 @@ static int fsi_i2c_write_fifo(struct fsi_i2c_port *port, struct i2c_msg *msg,\n static int fsi_i2c_read_fifo(struct fsi_i2c_port *port, struct i2c_msg *msg,\n \t\t\t u8 fifo_count)\n {\n-\tint read;\n-\tint rc;\n-\tstruct fsi_i2c_master *i2c = port->master;\n-\tint bytes_to_read;\n \tint xfr_remaining = msg->len - port->xfrd;\n+\tint bytes_to_read;\n \tu32 dummy;\n+\tint read;\n+\tint rc;\n \n \tbytes_to_read = min_t(int, fifo_count, xfr_remaining);\n \n@@ -307,7 +306,7 @@ static int fsi_i2c_read_fifo(struct fsi_i2c_port *port, struct i2c_msg *msg,\n \t\tread = fsi_i2c_get_op_bytes(bytes_to_read);\n \n \t\tif (xfr_remaining) {\n-\t\t\trc = fsi_device_read(i2c->fsi, I2C_FSI_FIFO,\n+\t\t\trc = fsi_device_read(port->master->fsi, I2C_FSI_FIFO,\n \t\t\t\t\t &msg->buf[port->xfrd], read);\n \t\t\tif (rc)\n \t\t\t\treturn rc;\n@@ -316,8 +315,8 @@ static int fsi_i2c_read_fifo(struct fsi_i2c_port *port, struct i2c_msg *msg,\n \t\t\txfr_remaining -= read;\n \t\t} else {\n \t\t\t/* no more buffer but data in fifo, need to clear it */\n-\t\t\trc = fsi_device_read(i2c->fsi, I2C_FSI_FIFO, &dummy,\n-\t\t\t\t\t read);\n+\t\t\trc = fsi_device_read(port->master->fsi, I2C_FSI_FIFO,\n+\t\t\t\t\t &dummy, read);\n \t\t\tif (rc)\n \t\t\t\treturn rc;\n \t\t}\n@@ -330,85 +329,80 @@ static int fsi_i2c_read_fifo(struct fsi_i2c_port *port, struct i2c_msg *msg,\n \n static int fsi_i2c_get_scl(struct i2c_adapter *adap)\n {\n-\tu32 stat = 0;\n \tstruct fsi_i2c_port *port = adap->algo_data;\n-\tstruct fsi_i2c_master *i2c = port->master;\n+\tu32 stat;\n \n-\tfsi_i2c_read_reg(i2c->fsi, I2C_FSI_STAT, &stat);\n+\tfsi_i2c_read_reg(port->master->fsi, I2C_FSI_STAT, &stat);\n \n \treturn !!(stat & I2C_STAT_SCL_IN);\n }\n \n static void fsi_i2c_set_scl(struct i2c_adapter *adap, int val)\n {\n-\tu32 dummy = 0;\n \tstruct fsi_i2c_port *port = adap->algo_data;\n-\tstruct fsi_i2c_master *i2c = port->master;\n+\tu32 dummy = 0;\n \n \tif (val)\n-\t\tfsi_i2c_write_reg(i2c->fsi, I2C_FSI_SET_SCL, &dummy);\n+\t\tfsi_i2c_write_reg(port->master->fsi, I2C_FSI_SET_SCL, &dummy);\n \telse\n-\t\tfsi_i2c_write_reg(i2c->fsi, I2C_FSI_RESET_SCL, &dummy);\n+\t\tfsi_i2c_write_reg(port->master->fsi, I2C_FSI_RESET_SCL, &dummy);\n }\n \n static int fsi_i2c_get_sda(struct i2c_adapter *adap)\n {\n-\tu32 stat = 0;\n \tstruct fsi_i2c_port *port = adap->algo_data;\n-\tstruct fsi_i2c_master *i2c = port->master;\n+\tu32 stat;\n \n-\tfsi_i2c_read_reg(i2c->fsi, I2C_FSI_STAT, &stat);\n+\tfsi_i2c_read_reg(port->master->fsi, I2C_FSI_STAT, &stat);\n \n \treturn !!(stat & I2C_STAT_SDA_IN);\n }\n \n static void fsi_i2c_set_sda(struct i2c_adapter *adap, int val)\n {\n-\tu32 dummy = 0;\n \tstruct fsi_i2c_port *port = adap->algo_data;\n-\tstruct fsi_i2c_master *i2c = port->master;\n+\tu32 dummy = 0;\n \n \tif (val)\n-\t\tfsi_i2c_write_reg(i2c->fsi, I2C_FSI_SET_SDA, &dummy);\n+\t\tfsi_i2c_write_reg(port->master->fsi, I2C_FSI_SET_SDA, &dummy);\n \telse\n-\t\tfsi_i2c_write_reg(i2c->fsi, I2C_FSI_RESET_SDA, &dummy);\n+\t\tfsi_i2c_write_reg(port->master->fsi, I2C_FSI_RESET_SDA, &dummy);\n }\n \n static void fsi_i2c_prepare_recovery(struct i2c_adapter *adap)\n {\n-\tint rc;\n-\tu32 mode;\n \tstruct fsi_i2c_port *port = adap->algo_data;\n-\tstruct fsi_i2c_master *i2c = port->master;\n+\tu32 mode;\n+\tint rc;\n \n-\trc = fsi_i2c_read_reg(i2c->fsi, I2C_FSI_MODE, &mode);\n+\trc = fsi_i2c_read_reg(port->master->fsi, I2C_FSI_MODE, &mode);\n \tif (rc)\n \t\treturn;\n \n \tmode |= I2C_MODE_DIAG;\n-\tfsi_i2c_write_reg(i2c->fsi, I2C_FSI_MODE, &mode);\n+\tfsi_i2c_write_reg(port->master->fsi, I2C_FSI_MODE, &mode);\n }\n \n static void fsi_i2c_unprepare_recovery(struct i2c_adapter *adap)\n {\n-\tint rc;\n-\tu32 mode;\n \tstruct fsi_i2c_port *port = adap->algo_data;\n-\tstruct fsi_i2c_master *i2c = port->master;\n+\tu32 mode;\n+\tint rc;\n \n-\trc = fsi_i2c_read_reg(i2c->fsi, I2C_FSI_MODE, &mode);\n+\trc = fsi_i2c_read_reg(port->master->fsi, I2C_FSI_MODE, &mode);\n \tif (rc)\n \t\treturn;\n \n \tmode &= ~I2C_MODE_DIAG;\n-\tfsi_i2c_write_reg(i2c->fsi, I2C_FSI_MODE, &mode);\n+\tfsi_i2c_write_reg(port->master->fsi, I2C_FSI_MODE, &mode);\n }\n \n static int fsi_i2c_reset_bus(struct fsi_i2c_master *i2c,\n \t\t\t struct fsi_i2c_port *port)\n {\n+\tu32 dummy = 0;\n+\tu32 stat;\n \tint rc;\n-\tu32 stat, dummy = 0;\n \n \t/* force bus reset, ignore errors */\n \ti2c_recover_bus(&port->adapter);\n@@ -439,8 +433,9 @@ static int fsi_i2c_reset_bus(struct fsi_i2c_master *i2c,\n \n static int fsi_i2c_reset_engine(struct fsi_i2c_master *i2c, u16 port)\n {\n+\tu32 dummy = 0;\n+\tu32 mode;\n \tint rc;\n-\tu32 mode, dummy = 0;\n \n \t/* reset engine */\n \trc = fsi_i2c_write_reg(i2c->fsi, I2C_FSI_RESET_I2C, &dummy);\n@@ -476,18 +471,17 @@ static int fsi_i2c_reset_engine(struct fsi_i2c_master *i2c, u16 port)\n \n static int fsi_i2c_abort(struct fsi_i2c_port *port, u32 status)\n {\n-\tint rc;\n-\tunsigned long start;\n+\tstruct fsi_i2c_master *i2c = port->master;\n \tu32 cmd = I2C_CMD_WITH_STOP;\n+\tunsigned long start;\n \tu32 stat;\n-\tstruct fsi_i2c_master *i2c = port->master;\n-\tstruct fsi_device *fsi = i2c->fsi;\n+\tint rc;\n \n \trc = fsi_i2c_reset_engine(i2c, port->port);\n \tif (rc)\n \t\treturn rc;\n \n-\trc = fsi_i2c_read_reg(fsi, I2C_FSI_STAT, &stat);\n+\trc = fsi_i2c_read_reg(i2c->fsi, I2C_FSI_STAT, &stat);\n \tif (rc)\n \t\treturn rc;\n \n@@ -503,15 +497,14 @@ static int fsi_i2c_abort(struct fsi_i2c_port *port, u32 status)\n \t\treturn 0;\n \n \t/* write stop command */\n-\trc = fsi_i2c_write_reg(fsi, I2C_FSI_CMD, &cmd);\n+\trc = fsi_i2c_write_reg(i2c->fsi, I2C_FSI_CMD, &cmd);\n \tif (rc)\n \t\treturn rc;\n \n \t/* wait until we see command complete in the master */\n \tstart = jiffies;\n-\n \tdo {\n-\t\trc = fsi_i2c_read_reg(fsi, I2C_FSI_STAT, &status);\n+\t\trc = fsi_i2c_read_reg(i2c->fsi, I2C_FSI_STAT, &status);\n \t\tif (rc)\n \t\t\treturn rc;\n \n@@ -527,8 +520,8 @@ static int fsi_i2c_abort(struct fsi_i2c_port *port, u32 status)\n static int fsi_i2c_handle_status(struct fsi_i2c_port *port,\n \t\t\t\t struct i2c_msg *msg, u32 status)\n {\n-\tint rc;\n \tu8 fifo_count;\n+\tint rc;\n \n \tif (status & I2C_STAT_ERR) {\n \t\trc = fsi_i2c_abort(port, status);\n@@ -576,9 +569,9 @@ static int fsi_i2c_handle_status(struct fsi_i2c_port *port,\n static int fsi_i2c_wait(struct fsi_i2c_port *port, struct i2c_msg *msg,\n \t\t\tunsigned long timeout)\n {\n-\tu32 status = 0;\n-\tint rc;\n \tunsigned long start = jiffies;\n+\tu32 status;\n+\tint rc;\n \n \tdo {\n \t\trc = fsi_i2c_read_reg(port->master->fsi, I2C_FSI_STAT,\n@@ -608,13 +601,13 @@ static int fsi_i2c_wait(struct fsi_i2c_port *port, struct i2c_msg *msg,\n static int fsi_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,\n \t\t\tint num)\n {\n-\tint i, rc;\n-\tunsigned long start_time;\n \tstruct fsi_i2c_port *port = adap->algo_data;\n-\tstruct fsi_i2c_master *master = port->master;\n+\tunsigned long start_time;\n \tstruct i2c_msg *msg;\n+\tint rc;\n+\tint i;\n \n-\tmutex_lock(&master->lock);\n+\tmutex_lock(&port->master->lock);\n \n \trc = fsi_i2c_set_port(port);\n \tif (rc)\n@@ -635,7 +628,7 @@ static int fsi_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,\n \t}\n \n unlock:\n-\tmutex_unlock(&master->lock);\n+\tmutex_unlock(&port->master->lock);\n \treturn rc ? : num;\n }\n \n@@ -681,8 +674,10 @@ static int fsi_i2c_probe(struct device *dev)\n \tstruct fsi_i2c_master *i2c;\n \tstruct fsi_i2c_port *port;\n \tstruct device_node *np;\n-\tu32 port_no, ports, stat;\n+\tu32 port_no;\n+\tu32 ports;\n \tu32 lbus;\n+\tu32 stat;\n \tint rc;\n \n \ti2c = devm_kzalloc(dev, sizeof(*i2c), GFP_KERNEL);\n@@ -752,14 +747,14 @@ static int fsi_i2c_probe(struct device *dev)\n \t}\n \n \tdev_set_drvdata(dev, i2c);\n-\n \treturn 0;\n }\n \n static int fsi_i2c_remove(struct device *dev)\n {\n \tstruct fsi_i2c_master *i2c = dev_get_drvdata(dev);\n-\tstruct fsi_i2c_port *port, *tmp;\n+\tstruct fsi_i2c_port *port;\n+\tstruct fsi_i2c_port *tmp;\n \n \tlist_for_each_entry_safe(port, tmp, &i2c->ports, list) {\n \t\tlist_del(&port->list);\n","prefixes":["v3","27/40"]}