From: Yisen Zhuang <Yisen.Zhuang@huawei.com>
To: <davem@davemloft.net>, <yisen.zhuang@huawei.com>,
<salil.mehta@huawei.com>
Cc: <akpm@linux-foundation.org>, <gregkh@linuxfoundation.org>,
<kvalo@codeaurora.org>, <mchehab@osg.samsung.com>,
<linux@roeck-us.net>, <jslaby@suse.cz>, <yankejian@huawei.com>,
<huangdaode@hisilicon.com>, <lipeng321@huawei.com>,
<xieqianqian@huawei.com>, <arnd@arndb.de>, <andrew@lunn.ch>,
<xypron.glpk@gmx.de>, <linux-kernel@vger.kernel.org>,
<netdev@vger.kernel.org>, <linuxarm@huawei.com>
Subject: [PATCH v3 net-next 2/9] net: hns: fix code style about hns driver
Date: Fri, 1 Jul 2016 17:34:06 +0800 [thread overview]
Message-ID: <1467365653-83331-3-git-send-email-Yisen.Zhuang@huawei.com> (raw)
In-Reply-To: <1467365653-83331-1-git-send-email-Yisen.Zhuang@huawei.com>
From: Daode Huang <huangdaode@hisilicon.com>
This patch fixes code sytle of hns driver to make it
simple.
Signed-off-by: Daode Huang <huangdaode@hisilicon.com>
Signed-off-by: Yisen Zhuang <Yisen.Zhuang@huawei.com>
---
drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
index 8473287..611b67b 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
@@ -253,10 +253,9 @@ static void hns_dsaf_ge_srst_by_port(struct dsaf_device *dsaf_dev, u32 port,
reg_val_1 = 0x1 << port;
port_rst_off = dsaf_dev->mac_cb[port]->port_rst_off;
/* there is difference between V1 and V2 in register.*/
- if (AE_IS_VER1(dsaf_dev->dsaf_ver))
- reg_val_2 = 0x1041041 << port_rst_off;
- else
- reg_val_2 = 0x2082082 << port_rst_off;
+ reg_val_2 = AE_IS_VER1(dsaf_dev->dsaf_ver) ?
+ 0x1041041 : 0x2082082;
+ reg_val_2 <<= port_rst_off;
if (!dereset) {
dsaf_write_sub(dsaf_dev, DSAF_SUB_SC_GE_RESET_REQ1_REG,
@@ -272,12 +271,11 @@ static void hns_dsaf_ge_srst_by_port(struct dsaf_device *dsaf_dev, u32 port,
reg_val_1);
}
} else {
- reg_val_1 = 0x15540 << dsaf_dev->reset_offset;
+ reg_val_1 = 0x15540;
+ reg_val_2 = AE_IS_VER1(dsaf_dev->dsaf_ver) ? 0x100 : 0x40;
- if (AE_IS_VER1(dsaf_dev->dsaf_ver))
- reg_val_2 = 0x100 << dsaf_dev->reset_offset;
- else
- reg_val_2 = 0x40 << dsaf_dev->reset_offset;
+ reg_val_1 <<= dsaf_dev->reset_offset;
+ reg_val_2 <<= dsaf_dev->reset_offset;
if (!dereset) {
dsaf_write_sub(dsaf_dev, DSAF_SUB_SC_GE_RESET_REQ1_REG,
--
1.9.1
next prev parent reply other threads:[~2016-07-01 9:34 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-01 9:34 [PATCH v3 net-next 0/9] net: hns: fix the typo of hns Yisen Zhuang
2016-07-01 9:34 ` [PATCH v3 net-next 1/9] MAINTAINERS: add maintainers for hns driver Yisen Zhuang
2016-07-01 9:34 ` Yisen Zhuang [this message]
2016-07-01 9:34 ` [PATCH v3 net-next 3/9] net: hns: change code style from a = a + x to a += x Yisen Zhuang
2016-07-01 9:34 ` [PATCH v3 net-next 4/9] net: hns: delete redundant parenthese Yisen Zhuang
2016-07-01 9:34 ` [PATCH v3 net-next 5/9] net: hns: add a space before "*/" Yisen Zhuang
2016-07-01 9:34 ` [PATCH v3 net-next 6/9] net: hns: normalize two different loop Yisen Zhuang
2016-07-01 9:34 ` [PATCH v3 net-next 7/9] net: hns: remove redundant hns_mac_dev_to_enet_if() Yisen Zhuang
2016-07-01 9:34 ` [PATCH v3 net-next 8/9] net: hns: add media-type property for hns Yisen Zhuang
2016-07-01 9:34 ` [PATCH v3 net-next 9/9] net: hns: get reset registers from DT Yisen Zhuang
2016-07-01 20:57 ` [PATCH v3 net-next 0/9] net: hns: fix the typo of hns David Miller
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=1467365653-83331-3-git-send-email-Yisen.Zhuang@huawei.com \
--to=yisen.zhuang@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=andrew@lunn.ch \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=gregkh@linuxfoundation.org \
--cc=huangdaode@hisilicon.com \
--cc=jslaby@suse.cz \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=linuxarm@huawei.com \
--cc=lipeng321@huawei.com \
--cc=mchehab@osg.samsung.com \
--cc=netdev@vger.kernel.org \
--cc=salil.mehta@huawei.com \
--cc=xieqianqian@huawei.com \
--cc=xypron.glpk@gmx.de \
--cc=yankejian@huawei.com \
/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).