From: Yisen Zhuang <Yisen.Zhuang@huawei.com>
To: <davem@davemloft.net>, <yisen.zhuang@huawei.com>,
<salil.mehta@huawei.com>, <yankejian@huawei.com>
Cc: <liguozhu@huawei.com>, <huangdaode@hisilicon.com>,
<arnd@arndb.de>, <andriy.shevchenko@linux.intel.com>,
<andrew@lunn.ch>, <geliangtang@163.com>, <ivecera@redhat.com>,
<fengguang.wu@intel.com>, <charles.chenxin@huawei.com>,
<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>, <linuxarm@huawei.com>
Subject: [PATCH net-next 7/9] net: hns: remove redundant hns_mac_dev_to_enet_if()
Date: Mon, 27 Jun 2016 17:54:13 +0800 [thread overview]
Message-ID: <1467021255-95900-8-git-send-email-Yisen.Zhuang@huawei.com> (raw)
In-Reply-To: <1467021255-95900-1-git-send-email-Yisen.Zhuang@huawei.com>
From: Kejian Yan <yankejian@huawei.com>
The sequence of hns_mac_dev_to_enet_if() is the same as
hns_get_enet_interface(), and hns_get_enet_interface() is called
by initialization to get the mac mode. And the mode is not changed
anywhere. Thus add hns_mac_dev_to_enet_if() function to get the mac
mode is obviously redundant.
Reported-by: Jinchuan Tian <tianjinchuan1@huawei.com>
Signed-off-by: Kejian Yan <yankejian@huawei.com>
---
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
index c526558..d2effcc 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
@@ -56,20 +56,6 @@ static const enum mac_mode g_mac_mode_1000[] = {
[PHY_INTERFACE_MODE_RTBI] = MAC_MODE_RTBI_1000
};
-static enum mac_mode hns_mac_dev_to_enet_if(const struct hns_mac_cb *mac_cb)
-{
- switch (mac_cb->max_speed) {
- case MAC_SPEED_100:
- return g_mac_mode_100[mac_cb->phy_if];
- case MAC_SPEED_1000:
- return g_mac_mode_1000[mac_cb->phy_if];
- case MAC_SPEED_10000:
- return MAC_MODE_XGMII_10000;
- default:
- return MAC_MODE_MII_100;
- }
-}
-
static enum mac_mode hns_get_enet_interface(const struct hns_mac_cb *mac_cb)
{
switch (mac_cb->max_speed) {
@@ -134,7 +120,6 @@ void hns_mac_adjust_link(struct hns_mac_cb *mac_cb, int speed, int duplex)
mac_cb->speed = speed;
mac_cb->half_duplex = !duplex;
- mac_ctrl_drv->mac_mode = hns_mac_dev_to_enet_if(mac_cb);
if (mac_ctrl_drv->adjust_link) {
ret = mac_ctrl_drv->adjust_link(mac_ctrl_drv,
--
1.9.1
next prev parent reply other threads:[~2016-06-27 9:54 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-27 9:54 [PATCH net-next 0/9] net: hns: fix the typo of hns Yisen Zhuang
2016-06-27 9:54 ` [PATCH net-next 1/9] MAINTAINERS: add maintainers for hns driver Yisen Zhuang
2016-06-27 9:54 ` [PATCH net-next 2/9] net: hns: fix code style about " Yisen Zhuang
2016-06-27 9:54 ` [PATCH net-next 3/9] net: hns: change code style from a = a + x to a += x Yisen Zhuang
2016-06-27 9:54 ` [PATCH net-next 4/9] net: hns: delete redundant parens Yisen Zhuang
2016-06-27 9:54 ` [PATCH net-next 5/9] net: hns: add a space before "*/" Yisen Zhuang
2016-06-27 9:54 ` [PATCH net-next 6/9] net: hns: normalize two different loop Yisen Zhuang
2016-06-27 11:49 ` Joe Perches
2016-06-27 12:00 ` Andy Shevchenko
2016-06-27 12:08 ` Joe Perches
2016-06-27 12:13 ` Andy Shevchenko
2016-06-28 5:41 ` Daode Huang
2016-06-27 9:54 ` Yisen Zhuang [this message]
2016-06-27 9:54 ` [PATCH net-next 8/9] net: hns: add media-type property for hns Yisen Zhuang
2016-06-27 9:54 ` [PATCH net-next 9/9] net: hns: get reset registers from DT Yisen Zhuang
2016-06-29 9:11 ` David Miller
2016-06-30 1:10 ` Yankejian (Hackim Yim)
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=1467021255-95900-8-git-send-email-Yisen.Zhuang@huawei.com \
--to=yisen.zhuang@huawei.com \
--cc=andrew@lunn.ch \
--cc=andriy.shevchenko@linux.intel.com \
--cc=arnd@arndb.de \
--cc=charles.chenxin@huawei.com \
--cc=davem@davemloft.net \
--cc=fengguang.wu@intel.com \
--cc=geliangtang@163.com \
--cc=huangdaode@hisilicon.com \
--cc=ivecera@redhat.com \
--cc=liguozhu@huawei.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=netdev@vger.kernel.org \
--cc=salil.mehta@huawei.com \
--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).