Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Helmut Grohne <helmut.grohne@intenta.de>
To: Andrew Lunn <andrew@lunn.ch>
Cc: Woojung Huh <woojung.huh@microchip.com>,
	Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>,
	Vivien Didelot <vivien.didelot@gmail.com>,
	Florian Fainelli <f.fainelli@gmail.com>,
	"David S. Miller" <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>, <netdev@vger.kernel.org>
Subject: [PATCH v2 1/6] net: dsa: microchip: delete unused member ksz_port.phy
Date: Mon, 17 Aug 2020 16:55:28 +0200	[thread overview]
Message-ID: <07566406b6957fc6e9dd434933aa111ed25a2115.1597675604.git.helmut.grohne@intenta.de> (raw)
In-Reply-To: <cover.1597675604.git.helmut.grohne@intenta.de>

Link: https://lore.kernel.org/netdev/20200721083300.GA12970@laureti-dev/
Signed-off-by: Helmut Grohne <helmut.grohne@intenta.de>
---
 drivers/net/dsa/microchip/ksz8795.c    | 1 -
 drivers/net/dsa/microchip/ksz9477.c    | 8 +-------
 drivers/net/dsa/microchip/ksz_common.h | 1 -
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c
index 8f1d15ea15d9..e62d54306765 100644
--- a/drivers/net/dsa/microchip/ksz8795.c
+++ b/drivers/net/dsa/microchip/ksz8795.c
@@ -1007,7 +1007,6 @@ static void ksz8795_config_cpu_port(struct dsa_switch *ds)
 		if (i == dev->port_cnt)
 			break;
 		p->on = 1;
-		p->phy = 1;
 	}
 	for (i = 0; i < dev->phy_port_cnt; i++) {
 		p = &dev->ports[i];
diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c
index dc999406ce86..c548894553bc 100644
--- a/drivers/net/dsa/microchip/ksz9477.c
+++ b/drivers/net/dsa/microchip/ksz9477.c
@@ -1305,14 +1305,8 @@ static void ksz9477_config_cpu_port(struct dsa_switch *ds)
 		p->member = dev->port_mask;
 		ksz9477_port_stp_state_set(ds, i, BR_STATE_DISABLED);
 		p->on = 1;
-		if (i < dev->phy_port_cnt)
-			p->phy = 1;
-		if (dev->chip_id == 0x00947700 && i == 6) {
+		if (dev->chip_id == 0x00947700 && i == 6)
 			p->sgmii = 1;
-
-			/* SGMII PHY detection code is not implemented yet. */
-			p->phy = 0;
-		}
 	}
 }
 
diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h
index 206838160f49..0432cd38bf0b 100644
--- a/drivers/net/dsa/microchip/ksz_common.h
+++ b/drivers/net/dsa/microchip/ksz_common.h
@@ -31,7 +31,6 @@ struct ksz_port {
 	struct phy_device phydev;
 
 	u32 on:1;			/* port is not disabled by hardware */
-	u32 phy:1;			/* port has a PHY */
 	u32 fiber:1;			/* port is fiber */
 	u32 sgmii:1;			/* port is SGMII */
 	u32 force:1;
-- 
2.20.1


  reply	other threads:[~2020-08-17 14:56 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-21  8:33 [RFC PATCH] net: dsa: microchip: delete dead code Helmut Grohne
2020-07-22 14:39 ` Andrew Lunn
2020-07-23  4:24   ` Helmut Grohne
2020-07-25 17:41     ` Andrew Lunn
2020-08-17 14:55       ` [PATCH v2 0/6] " Helmut Grohne
2020-08-17 14:55         ` Helmut Grohne [this message]
2020-08-17 14:55         ` [PATCH v2 2/6] net: dsa: microchip: delete unused member ksz_port.sgmii Helmut Grohne
2020-08-17 14:55         ` [PATCH v2 3/6] net: dsa: microchip: delete unused member ksz_port.force Helmut Grohne
2020-08-17 14:55         ` [PATCH v2 4/6] net: dsa: microchip: delete unused member ksz_device.last_port Helmut Grohne
2020-08-17 14:59         ` [PATCH v2 5/6] net: dsa: microchip: delete unused member ksz_device.regs_size Helmut Grohne
2020-08-17 14:59         ` [PATCH v2 6/6] net: dsa: microchip: delete unused member ksz_device.overrides Helmut Grohne
2020-08-17 15:18         ` [PATCH v2 0/6] net: dsa: microchip: delete dead code Florian Fainelli
2020-08-18  7:57           ` Helmut Grohne

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=07566406b6957fc6e9dd434933aa111ed25a2115.1597675604.git.helmut.grohne@intenta.de \
    --to=helmut.grohne@intenta.de \
    --cc=UNGLinuxDriver@microchip.com \
    --cc=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=f.fainelli@gmail.com \
    --cc=kuba@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=vivien.didelot@gmail.com \
    --cc=woojung.huh@microchip.com \
    --subject='Re: [PATCH v2 1/6] net: dsa: microchip: delete unused member ksz_port.phy' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).