7ace30aeb6
Backport upstream code split patch for qca8k needed for ipq40xx target to correctly implement a DSA driver. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
From 2349b83a2486c55b9dd225326f0172a84a43c5e4 Mon Sep 17 00:00:00 2001
|
|
From: Ansuel Smith <ansuelsmth@gmail.com>
|
|
Date: Sat, 16 Apr 2022 01:30:15 +0200
|
|
Subject: [PATCH 4/6] net: dsa: qca8k: drop dsa_switch_ops from qca8k_priv
|
|
|
|
Now that dsa_switch_ops is not switch specific anymore, we can drop it
|
|
from qca8k_priv and use the static ops directly for the dsa_switch
|
|
pointer.
|
|
|
|
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
|
|
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/dsa/qca8k.c | 3 +--
|
|
drivers/net/dsa/qca8k.h | 1 -
|
|
2 files changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/qca8k.c
|
|
+++ b/drivers/net/dsa/qca8k.c
|
|
@@ -3121,8 +3121,7 @@ qca8k_sw_probe(struct mdio_device *mdiod
|
|
priv->ds->dev = &mdiodev->dev;
|
|
priv->ds->num_ports = QCA8K_NUM_PORTS;
|
|
priv->ds->priv = priv;
|
|
- priv->ops = qca8k_switch_ops;
|
|
- priv->ds->ops = &priv->ops;
|
|
+ priv->ds->ops = &qca8k_switch_ops;
|
|
mutex_init(&priv->reg_mutex);
|
|
dev_set_drvdata(&mdiodev->dev, priv);
|
|
|
|
--- a/drivers/net/dsa/qca8k.h
|
|
+++ b/drivers/net/dsa/qca8k.h
|
|
@@ -388,7 +388,6 @@ struct qca8k_priv {
|
|
struct dsa_switch *ds;
|
|
struct mutex reg_mutex;
|
|
struct device *dev;
|
|
- struct dsa_switch_ops ops;
|
|
struct gpio_desc *reset_gpio;
|
|
struct net_device *mgmt_master; /* Track if mdio/mib Ethernet is available */
|
|
struct qca8k_mgmt_eth_data mgmt_eth_data;
|