From: <qii.wang@mediatek.com>
To: <wsa@the-dreams.de>
Cc: devicetree@vger.kernel.org, ryder.lee@mediatek.com,
qii.wang@mediatek.com, srv_heupstream@mediatek.com,
leilk.liu@mediatek.com, linux-kernel@vger.kernel.org,
linux-mediatek@lists.infradead.org, linux-i2c@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/5] i2c: mediatek: remove useless code and replace definitions
Date: Mon, 3 Dec 2018 21:32:51 +0800 [thread overview]
Message-ID: <1543843974-4054-3-git-send-email-qii.wang@mediatek.com> (raw)
In-Reply-To: <1543843974-4054-1-git-send-email-qii.wang@mediatek.com>
From: qii wang <qii.wang@mediatek.com>
Completion_done is useless when we don't use its return value,
so we remove it. Different speeds have been defined by macros,
so we use macros definitions.
Signed-off-by: qii wang <qii.wang@mediatek.com>
---
drivers/i2c/busses/i2c-mt65xx.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/i2c/busses/i2c-mt65xx.c b/drivers/i2c/busses/i2c-mt65xx.c
index a74ef76..660de1e 100644
--- a/drivers/i2c/busses/i2c-mt65xx.c
+++ b/drivers/i2c/busses/i2c-mt65xx.c
@@ -456,7 +456,7 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs,
control_reg = readw(i2c->base + OFFSET_CONTROL) &
~(I2C_CONTROL_DIR_CHANGE | I2C_CONTROL_RS);
- if ((i2c->speed_hz > 400000) || (left_num >= 1))
+ if ((i2c->speed_hz > MAX_FS_MODE_SPEED) || (left_num >= 1))
control_reg |= I2C_CONTROL_RS;
if (i2c->op == I2C_MASTER_WRRD)
@@ -465,7 +465,7 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs,
writew(control_reg, i2c->base + OFFSET_CONTROL);
/* set start condition */
- if (i2c->speed_hz <= 100000)
+ if (i2c->speed_hz <= I2C_DEFAULT_SPEED)
writew(I2C_ST_START_CON, i2c->base + OFFSET_EXT_CONF);
else
writew(I2C_FS_START_CON, i2c->base + OFFSET_EXT_CONF);
@@ -642,8 +642,6 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs,
return -ETIMEDOUT;
}
- completion_done(&i2c->msg_complete);
-
if (i2c->irq_stat & (I2C_HS_NACKERR | I2C_ACKERR)) {
dev_dbg(i2c->dev, "addr: %x, transfer ACK error\n", msgs->addr);
mtk_i2c_init_hw(i2c);
--
1.7.9.5
_______________________________________________
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:[~2018-12-03 13:34 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-03 13:32 [PATCH 0/5] add i2c support for mt7629 and mt8183 qii.wang
2018-12-03 13:32 ` [PATCH 1/5] dt-bindings: i2c: Add Mediatek MT7629 i2c binding qii.wang
2018-12-04 20:19 ` Sean Wang
2018-12-11 6:28 ` mtk15107
2018-12-03 13:32 ` qii.wang [this message]
2018-12-04 20:37 ` [PATCH 2/5] i2c: mediatek: remove useless code and replace definitions Sean Wang
2018-12-11 20:20 ` Wolfram Sang
2018-12-13 9:13 ` Qii Wang
2018-12-03 13:32 ` [PATCH 3/5] i2c: mediatek: Add offsets array for new i2c registers qii.wang
2018-12-04 20:45 ` Sean Wang
2018-12-03 13:32 ` [PATCH 4/5] dt-bindings: i2c: Add Mediatek MT8183 i2c binding qii.wang
2018-12-04 20:59 ` Sean Wang
2018-12-11 20:29 ` Wolfram Sang
2018-12-13 9:32 ` Qii Wang
2018-12-17 23:06 ` Wolfram Sang
2018-12-18 2:35 ` Qii Wang
2018-12-03 13:32 ` [PATCH 5/5] i2c: mediatek: Add i2c compatible for MediaTek MT8183 qii.wang
2018-12-04 5:49 ` Sean Wang
2018-12-12 7:18 ` Qii Wang
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=1543843974-4054-3-git-send-email-qii.wang@mediatek.com \
--to=qii.wang@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=leilk.liu@mediatek.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=ryder.lee@mediatek.com \
--cc=srv_heupstream@mediatek.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;
as well as URLs for NNTP newsgroup(s).