Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1699961

[PATCH net-next 2/2] net: dsa: lan9303: Simplify lan9303_xxx_packet_processing() usage

From Egil Hjelmeland <privat@egil-hjelmeland.no>
Newsgroups linux.kernel
Subject [PATCH net-next 2/2] net: dsa: lan9303: Simplify lan9303_xxx_packet_processing() usage
Date 2017-07-31 13:40 +0200
Message-ID <u9hdh-5GQ-35@gated-at.bofh.it> (permalink)
References <u9hdg-5GQ-7@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


Simplify usage of lan9303_enable_packet_processing,
lan9303_disable_packet_processing()

Signed-off-by: Egil Hjelmeland <privat@egil-hjelmeland.no>
---
 drivers/net/dsa/lan9303-core.c | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/drivers/net/dsa/lan9303-core.c b/drivers/net/dsa/lan9303-core.c
index 4d2bb8144c15..705267a1d2ba 100644
--- a/drivers/net/dsa/lan9303-core.c
+++ b/drivers/net/dsa/lan9303-core.c
@@ -559,15 +559,16 @@ static int lan9303_handle_reset(struct lan9303 *chip)
 /* stop processing packets for all ports */
 static int lan9303_disable_processing(struct lan9303 *chip)
 {
-	int ret;
+	int p;
 
-	ret = lan9303_disable_packet_processing(chip, 0);
-	if (ret)
-		return ret;
-	ret = lan9303_disable_packet_processing(chip, 1);
-	if (ret)
-		return ret;
-	return lan9303_disable_packet_processing(chip, 2);
+	for (p = 0; p <= 2; p++) {
+		int ret;
+
+		ret = lan9303_disable_packet_processing(chip, p);
+		if (ret)
+			return ret;
+	}
+	return 0;
 }
 
 static int lan9303_check_device(struct lan9303 *chip)
@@ -760,7 +761,6 @@ static int lan9303_port_enable(struct dsa_switch *ds, int port,
 	/* enable internal packet processing */
 	switch (port) {
 	case 1:
-		return lan9303_enable_packet_processing(chip, port);
 	case 2:
 		return lan9303_enable_packet_processing(chip, port);
 	default:
@@ -779,13 +779,9 @@ static void lan9303_port_disable(struct dsa_switch *ds, int port,
 	/* disable internal packet processing */
 	switch (port) {
 	case 1:
-		lan9303_disable_packet_processing(chip, port);
-		lan9303_phy_write(ds, chip->phy_addr_sel_strap + 1,
-				  MII_BMCR, BMCR_PDOWN);
-		break;
 	case 2:
 		lan9303_disable_packet_processing(chip, port);
-		lan9303_phy_write(ds, chip->phy_addr_sel_strap + 2,
+		lan9303_phy_write(ds, chip->phy_addr_sel_strap + port,
 				  MII_BMCR, BMCR_PDOWN);
 		break;
 	default:
-- 
2.11.0

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH net-next 0/2] Refactor lan9303_xxx_packet_processing Egil Hjelmeland <privat@egil-hjelmeland.no> - 2017-07-31 13:40 +0200
  [PATCH net-next 2/2] net: dsa: lan9303: Simplify lan9303_xxx_packet_processing() usage Egil Hjelmeland <privat@egil-hjelmeland.no> - 2017-07-31 13:40 +0200
    Re: [PATCH net-next 2/2] net: dsa: lan9303: Simplify  lan9303_xxx_packet_processing() usage Andrew Lunn <andrew@lunn.ch> - 2017-07-31 15:50 +0200
      Re: [PATCH net-next 2/2] net: dsa: lan9303: Simplify  lan9303_xxx_packet_processing() usage Egil Hjelmeland <privat@egil-hjelmeland.no> - 2017-07-31 16:20 +0200
        Re: [PATCH net-next 2/2] net: dsa: lan9303: Simplify  lan9303_xxx_packet_processing() usage Andrew Lunn <andrew@lunn.ch> - 2017-07-31 16:50 +0200
    Re: [PATCH net-next 2/2] net: dsa: lan9303: Simplify lan9303_xxx_packet_processing() usage Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-07-31 16:10 +0200
      Re: [PATCH net-next 2/2] net: dsa: lan9303: Simplify  lan9303_xxx_packet_processing() usage Egil Hjelmeland <privat@egil-hjelmeland.no> - 2017-07-31 16:40 +0200
        Re: [PATCH net-next 2/2] net: dsa: lan9303: Simplify lan9303_xxx_packet_processing() usage Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-07-31 16:50 +0200
          Re: [PATCH net-next 2/2] net: dsa: lan9303: Simplify  lan9303_xxx_packet_processing() usage Egil Hjelmeland <privat@egil-hjelmeland.no> - 2017-07-31 17:00 +0200
            Re: [PATCH net-next 2/2] net: dsa: lan9303: Simplify  lan9303_xxx_packet_processing() usage Egil Hjelmeland <privat@egil-hjelmeland.no> - 2017-07-31 17:10 +0200
              Re: [PATCH net-next 2/2] net: dsa: lan9303: Simplify lan9303_xxx_packet_processing() usage Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-07-31 17:20 +0200
            Re: [PATCH net-next 2/2] net: dsa: lan9303: Simplify lan9303_xxx_packet_processing() usage Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-07-31 17:10 +0200
  Re: [PATCH net-next 0/2] Refactor lan9303_xxx_packet_processing Andrew Lunn <andrew@lunn.ch> - 2017-07-31 15:30 +0200
    Re: [PATCH net-next 0/2] Refactor lan9303_xxx_packet_processing Egil Hjelmeland <privat@egil-hjelmeland.no> - 2017-07-31 15:40 +0200

csiph-web