netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ansuel Smith <ansuelsmth@gmail.com>
To: Andrew Lunn <andrew@lunn.ch>,
	Vivien Didelot <vivien.didelot@gmail.com>,
	Florian Fainelli <f.fainelli@gmail.com>,
	Vladimir Oltean <olteanv@gmail.com>,
	"David S. Miller" <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>,
	Russell King <linux@armlinux.org.uk>,
	Ansuel Smith <ansuelsmth@gmail.com>,
	linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Subject: [net-next PATCH 18/19] net: dsa: qca8k: use device_get_match_data instead of the OF variant
Date: Wed, 17 Nov 2021 22:04:50 +0100	[thread overview]
Message-ID: <20211117210451.26415-19-ansuelsmth@gmail.com> (raw)
In-Reply-To: <20211117210451.26415-1-ansuelsmth@gmail.com>

Drop of_platform include and device_get_match_data instead of the OF
variant.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
---
 drivers/net/dsa/qca/qca8k.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/net/dsa/qca/qca8k.c b/drivers/net/dsa/qca/qca8k.c
index cae58753bb1f..260cdac53990 100644
--- a/drivers/net/dsa/qca/qca8k.c
+++ b/drivers/net/dsa/qca/qca8k.c
@@ -14,7 +14,6 @@
 #include <net/dsa.h>
 #include <linux/of_net.h>
 #include <linux/of_mdio.h>
-#include <linux/of_platform.h>
 #include <linux/if_bridge.h>
 #include <linux/mdio.h>
 #include <linux/phylink.h>
@@ -929,7 +928,7 @@ qca8k_setup_of_pws_reg(struct qca8k_priv *priv)
 	 * Should be applied by default but we set this just to make sure.
 	 */
 	if (priv->switch_id == QCA8K_ID_QCA8327) {
-		data = of_device_get_match_data(priv->dev);
+		data = device_get_match_data(priv->dev);
 
 		/* Set the correct package of 148 pin for QCA8327 */
 		if (data->reduced_package)
@@ -1071,7 +1070,7 @@ static int qca8k_read_switch_id(struct qca8k_priv *priv)
 	int ret;
 
 	/* get the switches ID from the compatible */
-	data = of_device_get_match_data(priv->dev);
+	data = device_get_match_data(priv->dev);
 	if (!data)
 		return -ENODEV;
 
@@ -1674,7 +1673,7 @@ qca8k_get_strings(struct dsa_switch *ds, int port, u32 stringset, uint8_t *data)
 	if (stringset != ETH_SS_STATS)
 		return;
 
-	match_data = of_device_get_match_data(priv->dev);
+	match_data = device_get_match_data(priv->dev);
 
 	for (i = 0; i < match_data->mib_count; i++)
 		strncpy(data + i * ETH_GSTRING_LEN, ar8327_mib[i].name,
@@ -1692,7 +1691,7 @@ qca8k_get_ethtool_stats(struct dsa_switch *ds, int port,
 	u32 hi = 0;
 	int ret;
 
-	match_data = of_device_get_match_data(priv->dev);
+	match_data = device_get_match_data(priv->dev);
 
 	for (i = 0; i < match_data->mib_count; i++) {
 		mib = &ar8327_mib[i];
@@ -1723,7 +1722,7 @@ qca8k_get_sset_count(struct dsa_switch *ds, int port, int sset)
 	if (sset != ETH_SS_STATS)
 		return 0;
 
-	match_data = of_device_get_match_data(priv->dev);
+	match_data = device_get_match_data(priv->dev);
 
 	return match_data->mib_count;
 }
-- 
2.32.0


  parent reply	other threads:[~2021-11-17 21:07 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-17 21:04 [net-next PATCH 00/19] Multiple cleanup and feature for qca8k Ansuel Smith
2021-11-17 21:04 ` regmap: allow to define reg_update_bits for no bus configuration Ansuel Smith
2021-11-17 22:15   ` Mark Brown
2021-11-17 22:19     ` Ansuel Smith
2021-11-17 22:33       ` Mark Brown
2021-11-19  1:54         ` Jakub Kicinski
2021-11-19  2:00           ` Ansuel Smith
2021-11-19  2:00   ` patchwork-bot+netdevbpf
2021-11-17 21:04 ` [net-next PATCH 02/19] net: dsa: qca8k: remove redundant check in parse_port_config Ansuel Smith
2021-11-18 23:59   ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 03/19] net: dsa: qca8k: skip sgmii delay on double cpu conf Ansuel Smith
2021-11-19  0:58   ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 04/19] net: dsa: qca8k: convert to GENMASK/FIELD_PREP/FIELD_GET Ansuel Smith
2021-11-17 21:04 ` [net-next PATCH 05/19] net: dsa: qca8k: move read switch id function in qca8k_setup Ansuel Smith
2021-11-19  1:03   ` Vladimir Oltean
2021-11-19  1:08     ` Ansuel Smith
2021-11-21 18:34       ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 06/19] net: dsa: qca8k: remove extra mutex_init " Ansuel Smith
2021-11-17 21:04 ` [net-next PATCH 07/19] net: dsa: qca8k: set regmap init as mandatory for regmap conversion Ansuel Smith
2021-11-19  1:09   ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 08/19] net: dsa: qca8k: convert qca8k to regmap helper Ansuel Smith
2021-11-19  1:14   ` Vladimir Oltean
2021-11-19  1:28     ` Ansuel Smith
2021-11-21 18:31       ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 09/19] net: dsa: qca8k: add additional MIB counter and make it dynamic Ansuel Smith
2021-11-19  1:17   ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 10/19] net: dsa: qca8k: add support for port fast aging Ansuel Smith
2021-11-19  1:20   ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 11/19] net: dsa: qca8k: add support for mirror mode Ansuel Smith
2021-11-19  1:42   ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 12/19] net: dsa: qca8k: add set_ageing_time support Ansuel Smith
2021-11-19  1:47   ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 13/19] net: dsa: qca8k: add min/max ageing time Ansuel Smith
2021-11-19  1:49   ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 14/19] net: dsa: qca8k: add support for mdb_add/del Ansuel Smith
2021-11-19  2:06   ` Vladimir Oltean
2021-11-19  2:19     ` Ansuel Smith
2021-11-19  2:33       ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 15/19] net: dsa: qca8k: add LAG support Ansuel Smith
2021-11-19  2:13   ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 16/19] net: dsa: qca8k: enable mtu_enforcement_ingress Ansuel Smith
2021-11-19  2:20   ` Vladimir Oltean
2021-11-19  2:28     ` Ansuel Smith
2021-11-21 18:11       ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 17/19] net: dsa: qca8k: move qca8k to qca dir Ansuel Smith
2021-11-17 21:04 ` Ansuel Smith [this message]
2021-11-19  2:21   ` [net-next PATCH 18/19] net: dsa: qca8k: use device_get_match_data instead of the OF variant Vladimir Oltean
2021-11-19  2:32     ` Ansuel Smith
2021-11-21 18:03       ` Vladimir Oltean
2021-11-17 21:04 ` [net-next PATCH 19/19] net: dsa: qca8k: split qca8k in common and 8xxx specific code Ansuel Smith

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=20211117210451.26415-19-ansuelsmth@gmail.com \
    --to=ansuelsmth@gmail.com \
    --cc=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=f.fainelli@gmail.com \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=netdev@vger.kernel.org \
    --cc=olteanv@gmail.com \
    --cc=vivien.didelot@gmail.com \
    /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 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).