Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1435208

[PATCH v3 net-next 2/9] net: hns: fix code style about hns driver

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 net-next 0/9] net: hns: fix the typo of hns Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-07-01 11:30 +0200
  [PATCH v3 net-next 6/9] net: hns: normalize two different loop Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-07-01 11:30 +0200
  [PATCH v3 net-next 4/9] net: hns: delete redundant parenthese Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-07-01 11:30 +0200
  [PATCH v3 net-next 7/9] net: hns: remove redundant hns_mac_dev_to_enet_if() Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-07-01 11:30 +0200
  [PATCH v3 net-next 1/9] MAINTAINERS: add maintainers for hns driver Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-07-01 11:30 +0200
  [PATCH v3 net-next 2/9] net: hns: fix code style about hns driver Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-07-01 11:30 +0200
  Re: [PATCH v3 net-next 0/9] net: hns: fix the typo of hns David Miller <davem@davemloft.net> - 2016-07-01 23:00 +0200

csiph-web