{"id":808253,"url":"http://patchwork.ozlabs.org/api/1.2/patches/808253/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170831135303.12381-1-romain.perier@collabora.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/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,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170831135303.12381-1-romain.perier@collabora.com>","list_archive_url":null,"date":"2017-08-31T13:53:03","name":"[net-next,v6] net: stmmac: Delete dead code for MDIO registration","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"da8aedff7548523b1117576bd6eef0da557a7b51","submitter":{"id":70720,"url":"http://patchwork.ozlabs.org/api/1.2/people/70720/?format=json","name":"Romain Perier","email":"romain.perier@collabora.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170831135303.12381-1-romain.perier@collabora.com/mbox/","series":[{"id":831,"url":"http://patchwork.ozlabs.org/api/1.2/series/831/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=831","date":"2017-08-31T13:53:03","name":"[net-next,v6] net: stmmac: Delete dead code for MDIO registration","version":6,"mbox":"http://patchwork.ozlabs.org/series/831/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808253/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808253/checks/","tags":{},"related":[],"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 3xjkNk0s9Sz9sPm\n\tfor ;\n\tThu, 31 Aug 2017 23:53:26 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751827AbdHaNxN (ORCPT );\n\tThu, 31 Aug 2017 09:53:13 -0400","from bhuna.collabora.co.uk ([46.235.227.227]:33074 \"EHLO\n\tbhuna.collabora.co.uk\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751011AbdHaNxL (ORCPT\n\t); Thu, 31 Aug 2017 09:53:11 -0400","from [127.0.0.1] (localhost [127.0.0.1])\n\t(Authenticated sender: rperier) with ESMTPSA id C2D6F2608F9"],"From":"Romain Perier ","To":"Giuseppe Cavallaro ,\n\tAlexandre Torgue , Andrew Lunn ,\n\tFlorian Fainelli ","Cc":"\"David S. Miller\" , netdev@vger.kernel.org,\n\tlinux-kernel@vger.kernel.org, Romain Perier ","Subject":"[PATCH net-next v6] net: stmmac: Delete dead code for MDIO\n\tregistration","Date":"Thu, 31 Aug 2017 15:53:03 +0200","Message-Id":"<20170831135303.12381-1-romain.perier@collabora.com>","X-Mailer":"git-send-email 2.11.0","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"This code is no longer used, the logging function was changed by commit\nfbca164776e4 (\"net: stmmac: Use the right logging function in stmmac_mdio_register\").\nIt was previously showing information about the type of the IRQ, if it's\npolled, ignored or a normal interrupt. As we don't want information loss,\nI have moved this code to phy_attached_print().\n\nFixes: fbca164776e4 (\"net: stmmac: Use the right logging function in stmmac_mdio_register\")\nSigned-off-by: Romain Perier \n---\nHello,\n\nThis is the continuity of \"[PATCH v2 0/2] net: stmmac: phy logging fixes\",\nsee https://lkml.org/lkml/2017/8/21/288\n\nChanges in v6:\n- Rebased onto net-next\n\nChanges in v5:\n- Don't truncater commit fbca164776e4 in the message of *this* commit\n- Fixed typo\n\nChanges in v4:\n- Don't truncate the commit subject for \"Fixes\"\n- Fixed invalid sizeof() used with snprintf\n- Added \"net-next\" prefix to the title of the commit\n\nChanges in v3:\n- Removed patch 2/2: \"net: phy: Don't use drv when it is NULL in phy_attached_print\",\n fixed upstream by fcd03e362b1c\n (\"net: phy: Deal with unbound PHY driver in phy_attached_print()\")\n- Moved this code to phy_attached_print(), so we have more informations\n about the IRQ (poll, ignore or normal irq) and no information are loss.\n- Re-worded commit message\n\n drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 16 ----------------\n drivers/net/phy/phy_device.c | 22 +++++++++++++++++++---\n 2 files changed, 19 insertions(+), 19 deletions(-)","diff":"diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c\nindex 72ec711fcba2..f5f37bfa1d58 100644\n--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c\n+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c\n@@ -248,9 +248,6 @@ int stmmac_mdio_register(struct net_device *ndev)\n \tfound = 0;\n \tfor (addr = 0; addr < PHY_MAX_ADDR; addr++) {\n \t\tstruct phy_device *phydev = mdiobus_get_phy(new_bus, addr);\n-\t\tint act = 0;\n-\t\tchar irq_num[4];\n-\t\tchar *irq_str;\n \n \t\tif (!phydev)\n \t\t\tcontinue;\n@@ -273,19 +270,6 @@ int stmmac_mdio_register(struct net_device *ndev)\n \t\tif (priv->plat->phy_addr == -1)\n \t\t\tpriv->plat->phy_addr = addr;\n \n-\t\tact = (priv->plat->phy_addr == addr);\n-\t\tswitch (phydev->irq) {\n-\t\tcase PHY_POLL:\n-\t\t\tirq_str = \"POLL\";\n-\t\t\tbreak;\n-\t\tcase PHY_IGNORE_INTERRUPT:\n-\t\t\tirq_str = \"IGNORE\";\n-\t\t\tbreak;\n-\t\tdefault:\n-\t\t\tsprintf(irq_num, \"%d\", phydev->irq);\n-\t\t\tirq_str = irq_num;\n-\t\t\tbreak;\n-\t\t}\n \t\tphy_attached_info(phydev);\n \t\tfound = 1;\n \t}\ndiff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c\nindex 9493fb369682..c2f46e5053f7 100644\n--- a/drivers/net/phy/phy_device.c\n+++ b/drivers/net/phy/phy_device.c\n@@ -874,19 +874,35 @@ void phy_attached_info(struct phy_device *phydev)\n }\n EXPORT_SYMBOL(phy_attached_info);\n \n-#define ATTACHED_FMT \"attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\"\n+#define ATTACHED_FMT \"attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%s)\"\n void phy_attached_print(struct phy_device *phydev, const char *fmt, ...)\n {\n+\tchar *irq_str;\n+\tchar irq_num[4];\n+\n+\tswitch(phydev->irq) {\n+\tcase PHY_POLL:\n+\t\tirq_str = \"POLL\";\n+\t\tbreak;\n+\tcase PHY_IGNORE_INTERRUPT:\n+\t\tirq_str = \"IGNORE\";\n+\t\tbreak;\n+\tdefault:\n+\t\tsnprintf(irq_num, sizeof(irq_num), \"%d\", phydev->irq);\n+\t\tirq_str = irq_num;\n+\t\tbreak;\n+\t}\n+\n \tif (!fmt) {\n \t\tdev_info(&phydev->mdio.dev, ATTACHED_FMT \"\\n\",\n \t\t\t phydev->drv->name, phydev_name(phydev),\n-\t\t\t phydev->irq);\n+\t\t\t irq_str);\n \t} else {\n \t\tva_list ap;\n \n \t\tdev_info(&phydev->mdio.dev, ATTACHED_FMT,\n \t\t\t phydev->drv->name, phydev_name(phydev),\n-\t\t\t phydev->irq);\n+\t\t\t irq_str);\n \n \t\tva_start(ap, fmt);\n \t\tvprintk(fmt, ap);\n","prefixes":["net-next","v6"]}