{"id":807476,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807476/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<20170830082924.3180-6-antoine.tenart@free-electrons.com>","date":"2017-08-30T08:29:16","name":"[net-next,v4,05/13] net: mvpp2: simplify the link_event function","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"66cbabb01b14e23461f1228594e6cce5a75ad183","submitter":{"id":61603,"url":"http://patchwork.ozlabs.org/api/1.0/people/61603/?format=json","name":"Antoine Tenart","email":"antoine.tenart@free-electrons.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.0/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170830082924.3180-6-antoine.tenart@free-electrons.com/mbox/","series":[{"id":550,"url":"http://patchwork.ozlabs.org/api/1.0/series/550/?format=json","date":"2017-08-30T08:29:24","name":"net: mvpp2: comphy configuration","version":4,"mbox":"http://patchwork.ozlabs.org/series/550/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807476/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xhzKP4Lwzz9sRq\n\tfor ;\n\tWed, 30 Aug 2017 18:32:57 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751904AbdH3IcQ (ORCPT );\n\tWed, 30 Aug 2017 04:32:16 -0400","from mail.free-electrons.com ([62.4.15.54]:58131 \"EHLO\n\tmail.free-electrons.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751480AbdH3I3u (ORCPT\n\t); Wed, 30 Aug 2017 04:29:50 -0400","by mail.free-electrons.com (Postfix, from userid 110)\n\tid BD46221F6A; Wed, 30 Aug 2017 10:29:47 +0200 (CEST)","from localhost (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr\n\t[90.63.216.87])\n\tby mail.free-electrons.com (Postfix) with ESMTPSA id DF45921F69;\n\tWed, 30 Aug 2017 10:29:28 +0200 (CEST)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on\n\tmail.free-electrons.com","X-Spam-Level":"","X-Spam-Status":"No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT,\n\tURIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0","From":"Antoine Tenart ","To":"davem@davemloft.net, kishon@ti.com, andrew@lunn.ch,\n\tjason@lakedaemon.net, sebastian.hesselbarth@gmail.com,\n\tgregory.clement@free-electrons.com","Cc":"Antoine Tenart ,\n\tthomas.petazzoni@free-electrons.com, nadavh@marvell.com,\n\tlinux@armlinux.org.uk, linux-kernel@vger.kernel.org,\n\tmw@semihalf.com, stefanc@marvell.com,\n\tmiquel.raynal@free-electrons.com, netdev@vger.kernel.org","Subject":"[PATCH net-next v4 05/13] net: mvpp2: simplify the link_event\n\tfunction","Date":"Wed, 30 Aug 2017 10:29:16 +0200","Message-Id":"<20170830082924.3180-6-antoine.tenart@free-electrons.com>","X-Mailer":"git-send-email 2.13.5","In-Reply-To":"<20170830082924.3180-1-antoine.tenart@free-electrons.com>","References":"<20170830082924.3180-1-antoine.tenart@free-electrons.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"The link_event function is somewhat complicated. This cosmetic patch\nsimplifies it.\n\nSigned-off-by: Antoine Tenart \n---\n drivers/net/ethernet/marvell/mvpp2.c | 13 ++++---------\n 1 file changed, 4 insertions(+), 9 deletions(-)","diff":"diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c\nindex fab231858a41..9c0c81e68d55 100644\n--- a/drivers/net/ethernet/marvell/mvpp2.c\n+++ b/drivers/net/ethernet/marvell/mvpp2.c\n@@ -5740,7 +5740,6 @@ static void mvpp2_link_event(struct net_device *dev)\n {\n \tstruct mvpp2_port *port = netdev_priv(dev);\n \tstruct phy_device *phydev = dev->phydev;\n-\tint status_change = 0;\n \tu32 val;\n \n \tif (phydev->link) {\n@@ -5771,16 +5770,8 @@ static void mvpp2_link_event(struct net_device *dev)\n \t}\n \n \tif (phydev->link != port->link) {\n-\t\tif (!phydev->link) {\n-\t\t\tport->duplex = -1;\n-\t\t\tport->speed = 0;\n-\t\t}\n-\n \t\tport->link = phydev->link;\n-\t\tstatus_change = 1;\n-\t}\n \n-\tif (status_change) {\n \t\tif (phydev->link) {\n \t\t\tval = readl(port->base + MVPP2_GMAC_AUTONEG_CONFIG);\n \t\t\tval |= (MVPP2_GMAC_FORCE_LINK_PASS |\n@@ -5789,9 +5780,13 @@ static void mvpp2_link_event(struct net_device *dev)\n \t\t\tmvpp2_egress_enable(port);\n \t\t\tmvpp2_ingress_enable(port);\n \t\t} else {\n+\t\t\tport->duplex = -1;\n+\t\t\tport->speed = 0;\n+\n \t\t\tmvpp2_ingress_disable(port);\n \t\t\tmvpp2_egress_disable(port);\n \t\t}\n+\n \t\tphy_print_status(phydev);\n \t}\n }\n","prefixes":["net-next","v4","05/13"]}