All of lore.kernel.org
 help / color / mirror / Atom feed
From: Vivien Didelot <vivien.didelot@gmail.com>
To: "David S. Miller" <davem@davemloft.net>
Cc: linux-kernel@vger.kernel.org,
	Vivien Didelot <vivien.didelot@gmail.com>,
	Florian Fainelli <f.fainelli@gmail.com>,
	Andrew Lunn <andrew@lunn.ch>,
	netdev@vger.kernel.org
Subject: [PATCH net-next 11/16] net: dsa: mv88e6xxx: silently skip PVT ops
Date: Sat, 19 Oct 2019 23:19:36 -0400	[thread overview]
Message-ID: <20191020031941.3805884-12-vivien.didelot@gmail.com> (raw)
In-Reply-To: <20191020031941.3805884-1-vivien.didelot@gmail.com>

Since mv88e6xxx_pvt_map is a static helper, no need to return
-EOPNOTSUPP if the chip has no PVT, simply silently skip the operation.

Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
---
 drivers/net/dsa/mv88e6xxx/chip.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index d67deec77452..510ccdc2d03c 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -1253,7 +1253,7 @@ static int mv88e6xxx_pvt_map(struct mv88e6xxx_chip *chip, int dev, int port)
 	u16 pvlan = 0;
 
 	if (!mv88e6xxx_has_pvt(chip))
-		return -EOPNOTSUPP;
+		return 0;
 
 	/* Skip the local source device, which uses in-chip port VLAN */
 	if (dev != chip->ds->index)
@@ -2049,9 +2049,6 @@ static int mv88e6xxx_bridge_map(struct mv88e6xxx_chip *chip,
 		}
 	}
 
-	if (!mv88e6xxx_has_pvt(chip))
-		return 0;
-
 	/* Remap the Port VLAN of each cross-chip bridge group member */
 	for (dev = 0; dev < DSA_MAX_SWITCHES; ++dev) {
 		ds = chip->ds->dst->ds[dev];
@@ -2101,9 +2098,6 @@ static int mv88e6xxx_crosschip_bridge_join(struct dsa_switch *ds, int dev,
 	struct mv88e6xxx_chip *chip = ds->priv;
 	int err;
 
-	if (!mv88e6xxx_has_pvt(chip))
-		return 0;
-
 	mv88e6xxx_reg_lock(chip);
 	err = mv88e6xxx_pvt_map(chip, dev, port);
 	mv88e6xxx_reg_unlock(chip);
@@ -2116,9 +2110,6 @@ static void mv88e6xxx_crosschip_bridge_leave(struct dsa_switch *ds, int dev,
 {
 	struct mv88e6xxx_chip *chip = ds->priv;
 
-	if (!mv88e6xxx_has_pvt(chip))
-		return;
-
 	mv88e6xxx_reg_lock(chip);
 	if (mv88e6xxx_pvt_map(chip, dev, port))
 		dev_err(ds->dev, "failed to remap cross-chip Port VLAN\n");
-- 
2.23.0


  parent reply	other threads:[~2019-10-20  3:20 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-20  3:19 [PATCH net-next 00/16] net: dsa: turn arrays of ports into a list Vivien Didelot
2019-10-20  3:19 ` [PATCH net-next 01/16] net: dsa: use dsa_to_port helper everywhere Vivien Didelot
2019-10-21  2:34   ` Florian Fainelli
2019-10-21 12:31   ` Andrew Lunn
2019-10-21 15:44     ` Vivien Didelot
2019-10-20  3:19 ` [PATCH net-next 02/16] net: dsa: add ports list in the switch fabric Vivien Didelot
2019-10-21  2:36   ` Florian Fainelli
2019-10-21  2:58   ` Florian Fainelli
2019-10-21 12:37   ` Andrew Lunn
2019-10-21 20:00     ` Vivien Didelot
2019-10-20  3:19 ` [PATCH net-next 03/16] net: dsa: use ports list in dsa_to_port Vivien Didelot
2019-10-21  2:38   ` Florian Fainelli
2019-10-21 12:39   ` Andrew Lunn
2019-10-20  3:19 ` [PATCH net-next 04/16] net: dsa: use ports list to find slave Vivien Didelot
2019-10-21  2:39   ` Florian Fainelli
2019-10-21 12:42   ` Andrew Lunn
2019-10-20  3:19 ` [PATCH net-next 05/16] net: dsa: use ports list to setup switches Vivien Didelot
2019-10-21  2:42   ` Florian Fainelli
2019-10-21 12:49     ` Andrew Lunn
2019-10-21 19:37       ` Vivien Didelot
2019-10-20  3:19 ` [PATCH net-next 06/16] net: dsa: use ports list for routing table setup Vivien Didelot
2019-10-21  2:42   ` Florian Fainelli
2019-10-21 12:50   ` Andrew Lunn
2019-10-20  3:19 ` [PATCH net-next 07/16] net: dsa: use ports list to find a port by node Vivien Didelot
2019-10-21  2:43   ` Florian Fainelli
2019-10-20  3:19 ` [PATCH net-next 08/16] net: dsa: use ports list to setup multiple master devices Vivien Didelot
2019-10-21  3:03   ` Florian Fainelli
2019-10-21 14:17     ` Andrew Lunn
2019-10-20  3:19 ` [PATCH net-next 09/16] net: dsa: use ports list to find first CPU port Vivien Didelot
2019-10-21  2:46   ` Florian Fainelli
2019-10-20  3:19 ` [PATCH net-next 10/16] net: dsa: use ports list to setup default " Vivien Didelot
2019-10-21  2:47   ` Florian Fainelli
2019-10-20  3:19 ` Vivien Didelot [this message]
2019-10-21  2:48   ` [PATCH net-next 11/16] net: dsa: mv88e6xxx: silently skip PVT ops Florian Fainelli
2019-10-20  3:19 ` [PATCH net-next 12/16] net: dsa: mv88e6xxx: use ports list to map port VLAN Vivien Didelot
2019-10-21  2:50   ` Florian Fainelli
2019-10-20  3:19 ` [PATCH net-next 13/16] net: dsa: mv88e6xxx: use ports list to map bridge Vivien Didelot
2019-10-21  2:52   ` Florian Fainelli
2019-10-20  3:19 ` [PATCH net-next 14/16] net: dsa: sja1105: register switch before assigning port private data Vivien Didelot
2019-10-20  3:19 ` [PATCH net-next 15/16] net: dsa: allocate ports on touch Vivien Didelot
2019-10-21  2:56   ` Florian Fainelli
2019-10-20  3:19 ` [PATCH net-next 16/16] net: dsa: remove dsa_switch_alloc helper Vivien Didelot
2019-10-21  2:55   ` Florian Fainelli
2019-10-21 18:32 ` [PATCH net-next 00/16] net: dsa: turn arrays of ports into a list David Miller

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=20191020031941.3805884-12-vivien.didelot@gmail.com \
    --to=vivien.didelot@gmail.com \
    --cc=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=f.fainelli@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.