{"id":817632,"url":"http://patchwork.ozlabs.org/api/patches/817632/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170922161753.19563-3-vivien.didelot@savoirfairelinux.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/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":"<20170922161753.19563-3-vivien.didelot@savoirfairelinux.com>","list_archive_url":null,"date":"2017-09-22T16:17:51","name":"[net-next,2/4] net: dsa: remove phy arg from port enable/disable","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"5c91f7c39a954a51bf9e58e8201ce0d55156aef8","submitter":{"id":15889,"url":"http://patchwork.ozlabs.org/api/people/15889/?format=json","name":"Vivien Didelot","email":"vivien.didelot@savoirfairelinux.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170922161753.19563-3-vivien.didelot@savoirfairelinux.com/mbox/","series":[{"id":4666,"url":"http://patchwork.ozlabs.org/api/series/4666/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=4666","date":"2017-09-22T16:17:53","name":"net: dsa: simplify port enabling","version":1,"mbox":"http://patchwork.ozlabs.org/series/4666/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/817632/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/817632/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 3xzJfs3TDpz9s7g\n\tfor ;\n\tSat, 23 Sep 2017 02:22:45 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752653AbdIVQW3 (ORCPT );\n\tFri, 22 Sep 2017 12:22:29 -0400","from mail.savoirfairelinux.com ([208.88.110.44]:39456 \"EHLO\n\tmail.savoirfairelinux.com\" rhost-flags-OK-OK-OK-OK) by\n\tvger.kernel.org with ESMTP id S1752563AbdIVQVh (ORCPT\n\t); Fri, 22 Sep 2017 12:21:37 -0400","from localhost (localhost [127.0.0.1])\n\tby mail.savoirfairelinux.com (Postfix) with ESMTP id 57BAB9C28FF;\n\tFri, 22 Sep 2017 12:21:36 -0400 (EDT)","from mail.savoirfairelinux.com ([127.0.0.1])\n\tby localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new,\n\tport 10032)\n\twith ESMTP id 20RI1GMnsZBn; Fri, 22 Sep 2017 12:21:35 -0400 (EDT)","from localhost (localhost [127.0.0.1])\n\tby mail.savoirfairelinux.com (Postfix) with ESMTP id 61BE89C2D0B;\n\tFri, 22 Sep 2017 12:21:35 -0400 (EDT)","from mail.savoirfairelinux.com ([127.0.0.1])\n\tby localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new,\n\tport 10026)\n\twith ESMTP id OKv6zH9oihU8; Fri, 22 Sep 2017 12:21:35 -0400 (EDT)","from weeman.mtl.sfl (unknown [192.168.49.192])\n\tby mail.savoirfairelinux.com (Postfix) with ESMTPSA id 1F53B9C28FF;\n\tFri, 22 Sep 2017 12:21:35 -0400 (EDT)"],"X-Virus-Scanned":"amavisd-new at mail.savoirfairelinux.com","From":"Vivien Didelot ","To":"netdev@vger.kernel.org","Cc":"linux-kernel@vger.kernel.org, kernel@savoirfairelinux.com,\n\t\"David S. Miller\" ,\n\tFlorian Fainelli , Andrew Lunn ,\n\tVivien Didelot ","Subject":"[PATCH net-next 2/4] net: dsa: remove phy arg from port\n\tenable/disable","Date":"Fri, 22 Sep 2017 12:17:51 -0400","Message-Id":"<20170922161753.19563-3-vivien.didelot@savoirfairelinux.com>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20170922161753.19563-1-vivien.didelot@savoirfairelinux.com>","References":"<20170922161753.19563-1-vivien.didelot@savoirfairelinux.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"The .port_enable and .port_disable functions are meant to deal with the\nswitch ports only, and no driver is using the phy argument anyway.\nRemove it.\n\nSigned-off-by: Vivien Didelot \n---\n drivers/net/dsa/b53/b53_common.c | 6 +++---\n drivers/net/dsa/b53/b53_priv.h | 4 ++--\n drivers/net/dsa/bcm_sf2.c | 16 +++++++---------\n drivers/net/dsa/lan9303-core.c | 6 ++----\n drivers/net/dsa/microchip/ksz_common.c | 6 ++----\n drivers/net/dsa/mt7530.c | 8 +++-----\n drivers/net/dsa/mv88e6xxx/chip.c | 6 ++----\n drivers/net/dsa/qca8k.c | 6 ++----\n include/net/dsa.h | 6 ++----\n net/dsa/slave.c | 4 ++--\n 10 files changed, 27 insertions(+), 41 deletions(-)","diff":"diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c\nindex d4ce092def83..e46eb29d29f0 100644\n--- a/drivers/net/dsa/b53/b53_common.c\n+++ b/drivers/net/dsa/b53/b53_common.c\n@@ -502,7 +502,7 @@ void b53_imp_vlan_setup(struct dsa_switch *ds, int cpu_port)\n }\n EXPORT_SYMBOL(b53_imp_vlan_setup);\n \n-int b53_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy)\n+int b53_enable_port(struct dsa_switch *ds, int port)\n {\n \tstruct b53_device *dev = ds->priv;\n \tunsigned int cpu_port = dev->cpu_port;\n@@ -531,7 +531,7 @@ int b53_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy)\n }\n EXPORT_SYMBOL(b53_enable_port);\n \n-void b53_disable_port(struct dsa_switch *ds, int port, struct phy_device *phy)\n+void b53_disable_port(struct dsa_switch *ds, int port)\n {\n \tstruct b53_device *dev = ds->priv;\n \tu8 reg;\n@@ -874,7 +874,7 @@ static int b53_setup(struct dsa_switch *ds)\n \t\tif (dsa_is_cpu_port(ds, port))\n \t\t\tb53_enable_cpu_port(dev, port);\n \t\telse if (!(BIT(port) & ds->enabled_port_mask))\n-\t\t\tb53_disable_port(ds, port, NULL);\n+\t\t\tb53_disable_port(ds, port);\n \t}\n \n \treturn ret;\ndiff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h\nindex 603c66d240d8..688d02ee6155 100644\n--- a/drivers/net/dsa/b53/b53_priv.h\n+++ b/drivers/net/dsa/b53/b53_priv.h\n@@ -311,8 +311,8 @@ int b53_mirror_add(struct dsa_switch *ds, int port,\n \t\t struct dsa_mall_mirror_tc_entry *mirror, bool ingress);\n void b53_mirror_del(struct dsa_switch *ds, int port,\n \t\t struct dsa_mall_mirror_tc_entry *mirror);\n-int b53_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy);\n-void b53_disable_port(struct dsa_switch *ds, int port, struct phy_device *phy);\n+int b53_enable_port(struct dsa_switch *ds, int port);\n+void b53_disable_port(struct dsa_switch *ds, int port);\n void b53_brcm_hdr_setup(struct dsa_switch *ds, int port);\n void b53_eee_enable_set(struct dsa_switch *ds, int port, bool enable);\n int b53_eee_init(struct dsa_switch *ds, int port, struct phy_device *phy);\ndiff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c\nindex ad96b9725a2c..77e0c43f973b 100644\n--- a/drivers/net/dsa/bcm_sf2.c\n+++ b/drivers/net/dsa/bcm_sf2.c\n@@ -159,8 +159,7 @@ static inline void bcm_sf2_port_intr_disable(struct bcm_sf2_priv *priv,\n \tintrl2_1_writel(priv, P_IRQ_MASK(off), INTRL2_CPU_CLEAR);\n }\n \n-static int bcm_sf2_port_setup(struct dsa_switch *ds, int port,\n-\t\t\t struct phy_device *phy)\n+static int bcm_sf2_port_setup(struct dsa_switch *ds, int port)\n {\n \tstruct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);\n \tunsigned int i;\n@@ -191,11 +190,10 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port,\n \tif (port == priv->moca_port)\n \t\tbcm_sf2_port_intr_enable(priv, port);\n \n-\treturn b53_enable_port(ds, port, phy);\n+\treturn b53_enable_port(ds, port);\n }\n \n-static void bcm_sf2_port_disable(struct dsa_switch *ds, int port,\n-\t\t\t\t struct phy_device *phy)\n+static void bcm_sf2_port_disable(struct dsa_switch *ds, int port)\n {\n \tstruct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);\n \tu32 off, reg;\n@@ -214,7 +212,7 @@ static void bcm_sf2_port_disable(struct dsa_switch *ds, int port,\n \telse\n \t\toff = CORE_G_PCTL_PORT(port);\n \n-\tb53_disable_port(ds, port, phy);\n+\tb53_disable_port(ds, port);\n \n \t/* Power down the port memory */\n \treg = core_readl(priv, CORE_MEM_PSM_VDD_CTRL);\n@@ -613,7 +611,7 @@ static int bcm_sf2_sw_suspend(struct dsa_switch *ds)\n \tfor (port = 0; port < DSA_MAX_PORTS; port++) {\n \t\tif ((1 << port) & ds->enabled_port_mask ||\n \t\t dsa_is_cpu_port(ds, port))\n-\t\t\tbcm_sf2_port_disable(ds, port, NULL);\n+\t\t\tbcm_sf2_port_disable(ds, port);\n \t}\n \n \treturn 0;\n@@ -636,7 +634,7 @@ static int bcm_sf2_sw_resume(struct dsa_switch *ds)\n \n \tfor (port = 0; port < DSA_MAX_PORTS; port++) {\n \t\tif ((1 << port) & ds->enabled_port_mask)\n-\t\t\tbcm_sf2_port_setup(ds, port, NULL);\n+\t\t\tbcm_sf2_port_setup(ds, port);\n \t\telse if (dsa_is_cpu_port(ds, port))\n \t\t\tbcm_sf2_imp_setup(ds, port);\n \t}\n@@ -745,7 +743,7 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds)\n \t\tif (dsa_is_cpu_port(ds, port))\n \t\t\tbcm_sf2_imp_setup(ds, port);\n \t\telse if (!((1 << port) & ds->enabled_port_mask))\n-\t\t\tbcm_sf2_port_disable(ds, port, NULL);\n+\t\t\tbcm_sf2_port_disable(ds, port);\n \t}\n \n \tbcm_sf2_sw_configure_vlan(ds);\ndiff --git a/drivers/net/dsa/lan9303-core.c b/drivers/net/dsa/lan9303-core.c\nindex 07355db2ad81..0c33b02562dc 100644\n--- a/drivers/net/dsa/lan9303-core.c\n+++ b/drivers/net/dsa/lan9303-core.c\n@@ -799,8 +799,7 @@ static void lan9303_adjust_link(struct dsa_switch *ds, int port,\n \t}\n }\n \n-static int lan9303_port_enable(struct dsa_switch *ds, int port,\n-\t\t\t struct phy_device *phy)\n+static int lan9303_port_enable(struct dsa_switch *ds, int port)\n {\n \tstruct lan9303 *chip = ds->priv;\n \n@@ -817,8 +816,7 @@ static int lan9303_port_enable(struct dsa_switch *ds, int port,\n \treturn -ENODEV;\n }\n \n-static void lan9303_port_disable(struct dsa_switch *ds, int port,\n-\t\t\t\t struct phy_device *phy)\n+static void lan9303_port_disable(struct dsa_switch *ds, int port)\n {\n \tstruct lan9303 *chip = ds->priv;\n \ndiff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c\nindex 56cd6d365352..4095c50ae111 100644\n--- a/drivers/net/dsa/microchip/ksz_common.c\n+++ b/drivers/net/dsa/microchip/ksz_common.c\n@@ -418,8 +418,7 @@ static int ksz_phy_write16(struct dsa_switch *ds, int addr, int reg, u16 val)\n \treturn 0;\n }\n \n-static int ksz_enable_port(struct dsa_switch *ds, int port,\n-\t\t\t struct phy_device *phy)\n+static int ksz_enable_port(struct dsa_switch *ds, int port)\n {\n \tstruct ksz_device *dev = ds->priv;\n \n@@ -429,8 +428,7 @@ static int ksz_enable_port(struct dsa_switch *ds, int port,\n \treturn 0;\n }\n \n-static void ksz_disable_port(struct dsa_switch *ds, int port,\n-\t\t\t struct phy_device *phy)\n+static void ksz_disable_port(struct dsa_switch *ds, int port)\n {\n \tstruct ksz_device *dev = ds->priv;\n \ndiff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c\nindex faa3b88d2206..0a7f6209767f 100644\n--- a/drivers/net/dsa/mt7530.c\n+++ b/drivers/net/dsa/mt7530.c\n@@ -693,8 +693,7 @@ mt7530_cpu_port_enable(struct mt7530_priv *priv,\n }\n \n static int\n-mt7530_port_enable(struct dsa_switch *ds, int port,\n-\t\t struct phy_device *phy)\n+mt7530_port_enable(struct dsa_switch *ds, int port)\n {\n \tstruct mt7530_priv *priv = ds->priv;\n \n@@ -719,8 +718,7 @@ mt7530_port_enable(struct dsa_switch *ds, int port,\n }\n \n static void\n-mt7530_port_disable(struct dsa_switch *ds, int port,\n-\t\t struct phy_device *phy)\n+mt7530_port_disable(struct dsa_switch *ds, int port)\n {\n \tstruct mt7530_priv *priv = ds->priv;\n \n@@ -1006,7 +1004,7 @@ mt7530_setup(struct dsa_switch *ds)\n \t\tif (dsa_is_cpu_port(ds, i))\n \t\t\tmt7530_cpu_port_enable(priv, i);\n \t\telse\n-\t\t\tmt7530_port_disable(ds, i, NULL);\n+\t\t\tmt7530_port_disable(ds, i);\n \t}\n \n \t/* Flush the FDB table */\ndiff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c\nindex c6678aa9b4ef..e47898fb7dbc 100644\n--- a/drivers/net/dsa/mv88e6xxx/chip.c\n+++ b/drivers/net/dsa/mv88e6xxx/chip.c\n@@ -1862,8 +1862,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)\n \treturn mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_DEFAULT_VLAN, 0);\n }\n \n-static int mv88e6xxx_port_enable(struct dsa_switch *ds, int port,\n-\t\t\t\t struct phy_device *phydev)\n+static int mv88e6xxx_port_enable(struct dsa_switch *ds, int port)\n {\n \tstruct mv88e6xxx_chip *chip = ds->priv;\n \tint err;\n@@ -1875,8 +1874,7 @@ static int mv88e6xxx_port_enable(struct dsa_switch *ds, int port,\n \treturn err;\n }\n \n-static void mv88e6xxx_port_disable(struct dsa_switch *ds, int port,\n-\t\t\t\t struct phy_device *phydev)\n+static void mv88e6xxx_port_disable(struct dsa_switch *ds, int port)\n {\n \tstruct mv88e6xxx_chip *chip = ds->priv;\n \ndiff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c\nindex 82f09711ac1a..622ee9b8e72b 100644\n--- a/drivers/net/dsa/qca8k.c\n+++ b/drivers/net/dsa/qca8k.c\n@@ -743,8 +743,7 @@ qca8k_port_bridge_leave(struct dsa_switch *ds, int port, struct net_device *br)\n }\n \n static int\n-qca8k_port_enable(struct dsa_switch *ds, int port,\n-\t\t struct phy_device *phy)\n+qca8k_port_enable(struct dsa_switch *ds, int port)\n {\n \tstruct qca8k_priv *priv = (struct qca8k_priv *)ds->priv;\n \n@@ -755,8 +754,7 @@ qca8k_port_enable(struct dsa_switch *ds, int port,\n }\n \n static void\n-qca8k_port_disable(struct dsa_switch *ds, int port,\n-\t\t struct phy_device *phy)\n+qca8k_port_disable(struct dsa_switch *ds, int port)\n {\n \tstruct qca8k_priv *priv = (struct qca8k_priv *)ds->priv;\n \ndiff --git a/include/net/dsa.h b/include/net/dsa.h\nindex 8dee216a5a9b..65b031a69c19 100644\n--- a/include/net/dsa.h\n+++ b/include/net/dsa.h\n@@ -337,10 +337,8 @@ struct dsa_switch_ops {\n \t/*\n \t * Port enable/disable\n \t */\n-\tint\t(*port_enable)(struct dsa_switch *ds, int port,\n-\t\t\t struct phy_device *phy);\n-\tvoid\t(*port_disable)(struct dsa_switch *ds, int port,\n-\t\t\t\tstruct phy_device *phy);\n+\tint\t(*port_enable)(struct dsa_switch *ds, int port);\n+\tvoid\t(*port_disable)(struct dsa_switch *ds, int port);\n \n \t/*\n \t * Port's MAC EEE settings\ndiff --git a/net/dsa/slave.c b/net/dsa/slave.c\nindex 606812160fd5..6290741e496a 100644\n--- a/net/dsa/slave.c\n+++ b/net/dsa/slave.c\n@@ -100,7 +100,7 @@ static int dsa_slave_open(struct net_device *dev)\n \t}\n \n \tif (ds->ops->port_enable) {\n-\t\terr = ds->ops->port_enable(ds, p->dp->index, p->phy);\n+\t\terr = ds->ops->port_enable(ds, p->dp->index);\n \t\tif (err)\n \t\t\tgoto clear_promisc;\n \t}\n@@ -155,7 +155,7 @@ static int dsa_slave_close(struct net_device *dev)\n \t\tdev_uc_del(master, dev->dev_addr);\n \n \tif (ds->ops->port_disable)\n-\t\tds->ops->port_disable(ds, p->dp->index, p->phy);\n+\t\tds->ops->port_disable(ds, p->dp->index);\n \n \tdsa_port_set_state_now(p->dp, BR_STATE_DISABLED);\n \n","prefixes":["net-next","2/4"]}