From patchwork Fri Mar 22 00:05:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 1060613 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="UuvAyF5K"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44QP6v4qGJz9sRx for ; Fri, 22 Mar 2019 11:05:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727375AbfCVAFK (ORCPT ); Thu, 21 Mar 2019 20:05:10 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:38251 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727251AbfCVAFI (ORCPT ); Thu, 21 Mar 2019 20:05:08 -0400 Received: by mail-wm1-f68.google.com with SMTP id a188so475389wmf.3; Thu, 21 Mar 2019 17:05:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AWSS4ZeyIqEuO+k/uGTwjoIiMvVkiqyU0VrU837f+Is=; b=UuvAyF5KEo6ZQStVWDK7JiTpDm9zXQiC+vAmLIL62epQW4OlpIOpUycdL2h6nHbcRQ JqGYl1vRk9JL+5FExykxhA0bL+/Hr816HehHselVLB3YuaojyDvqK6D5Zq9tagL84HHT 3hnqHdIBdVQLvCPRZmZ/DkOtMoucDbM3GPHBQQMx+AmBjK0QXtQoI9Uas1V/24eV3cKJ nCM870DD12KJ2tQBu0Dznh+pPiQ3a4Sci76+EjlznvX07zS1IO0jRQDYCj020//DBS7y cxK0ic7Cq6V4wQcPw99cPOBY8yXjMBU1TiitCwaZrbEqFXudp7ir1zHT1/fESXYhDoYM e/8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AWSS4ZeyIqEuO+k/uGTwjoIiMvVkiqyU0VrU837f+Is=; b=j88yO4mJxZXvnGdxR9jLxJ+XDiWc5+xay+s4TNjefADYm71+1eRZpvWVTY16Jf7uk2 cRcBgtopvFwIZP01Etyas5MMW4A6jJqpw7YiB5Qz6gzMHdxQJvODBGH69tGK29U6mCA7 Vd1uWaj4N6i2qH9nyR7BV1/jCfzQ0N+1LH8PJfbMwJ3CmiFv+XBK25HYTM0zZeizuwx7 LswvuS1ZBniCoyheZXVMGDcOMlBz6A20EJh6nJhK2blt3/LsqZq4v0Mf7SAtljPaDWoS 12YLyKpOdroWd/GPb4qjMTjyVf37tNOVeoX472N+l/pGFe3FpxPMbFYDMg2HY24cLaKw xp4w== X-Gm-Message-State: APjAAAVwxTanuJvUc4Fq6IbJiQtPUay0AdaHd8PpRFocNI+nnJyuMVQ1 78zSGRHAl55UPJJzFE9Tb8e1ru1B X-Google-Smtp-Source: APXvYqwgmyBtuX2N+6wBFWq0mELebRAtKfpvDpOF5fgLza7C6iy0F38pAe1Jxj6obe22mX0ZZnqGDg== X-Received: by 2002:a1c:eb17:: with SMTP id j23mr1058805wmh.86.1553213105969; Thu, 21 Mar 2019 17:05:05 -0700 (PDT) Received: from debian64.daheim (p4FD091E7.dip0.t-ipconnect.de. [79.208.145.231]) by smtp.gmail.com with ESMTPSA id w24sm6412376wmi.40.2019.03.21.17.05.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Mar 2019 17:05:04 -0700 (PDT) Received: from chuck by debian64.daheim with local (Exim 4.92) (envelope-from ) id 1h77gF-0005qg-NM; Fri, 22 Mar 2019 01:05:03 +0100 From: Christian Lamparter To: netdev@vger.kernel.org, devicetree@vger.kernel.org Cc: Florian Fainelli , Vivien Didelot , Andrew Lunn , Rob Herring , Mark Rutland , Marek Behun Subject: [PATCH v4 3/4] net: dsa: qca8k: remove leftover phy accessors Date: Fri, 22 Mar 2019 01:05:02 +0100 Message-Id: <20190322000503.22431-3-chunkeey@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190322000503.22431-1-chunkeey@gmail.com> References: <20190322000503.22431-1-chunkeey@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This belated patch implements Andrew Lunn's request of "remove the phy_read() and phy_write() functions." While seemingly harmless, this causes the switch's user port PHYs to get registered twice. This is because the DSA subsystem will create a slave mdio-bus not knowing that the qca8k_phy_(read|write) accessors operate on the external mdio-bus. So the same "bus" gets effectively duplicated. Cc: stable@vger.kernel.org Fixes: 6b93fb46480a ("net-next: dsa: add new driver for qca8xxx family") Signed-off-by: Christian Lamparter --- This (standalone) patch should be much easier to backport than the big one. --- drivers/net/dsa/qca8k.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c index 576b37d12a63..14ad78225f07 100644 --- a/drivers/net/dsa/qca8k.c +++ b/drivers/net/dsa/qca8k.c @@ -624,22 +624,6 @@ qca8k_adjust_link(struct dsa_switch *ds, int port, struct phy_device *phy) qca8k_port_set_status(priv, port, 1); } -static int -qca8k_phy_read(struct dsa_switch *ds, int phy, int regnum) -{ - struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv; - - return mdiobus_read(priv->bus, phy, regnum); -} - -static int -qca8k_phy_write(struct dsa_switch *ds, int phy, int regnum, u16 val) -{ - struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv; - - return mdiobus_write(priv->bus, phy, regnum, val); -} - static void qca8k_get_strings(struct dsa_switch *ds, int port, u32 stringset, uint8_t *data) { @@ -879,8 +863,6 @@ static const struct dsa_switch_ops qca8k_switch_ops = { .setup = qca8k_setup, .adjust_link = qca8k_adjust_link, .get_strings = qca8k_get_strings, - .phy_read = qca8k_phy_read, - .phy_write = qca8k_phy_write, .get_ethtool_stats = qca8k_get_ethtool_stats, .get_sset_count = qca8k_get_sset_count, .get_mac_eee = qca8k_get_mac_eee,