| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546 |
- From 36b8af12f424e7a7f60a935c60a0fd4aa0822378 Mon Sep 17 00:00:00 2001
- From: Ansuel Smith <[email protected]>
- Date: Mon, 22 Nov 2021 16:23:43 +0100
- Subject: net: dsa: qca8k: move regmap init in probe and set it mandatory
- In preparation for regmap conversion, move regmap init in the probe
- function and make it mandatory as any read/write/rmw operation will be
- converted to regmap API.
- Signed-off-by: Ansuel Smith <[email protected]>
- Reviewed-by: Vladimir Oltean <[email protected]>
- Signed-off-by: David S. Miller <[email protected]>
- ---
- drivers/net/dsa/qca8k.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
- --- a/drivers/net/dsa/qca8k.c
- +++ b/drivers/net/dsa/qca8k.c
- @@ -1086,12 +1086,6 @@ qca8k_setup(struct dsa_switch *ds)
- if (ret)
- return ret;
-
- - /* Start by setting up the register mapping */
- - priv->regmap = devm_regmap_init(ds->dev, NULL, priv,
- - &qca8k_regmap_config);
- - if (IS_ERR(priv->regmap))
- - dev_warn(priv->dev, "regmap initialization failed");
- -
- ret = qca8k_setup_mdio_bus(priv);
- if (ret)
- return ret;
- @@ -2096,6 +2090,14 @@ qca8k_sw_probe(struct mdio_device *mdiod
- gpiod_set_value_cansleep(priv->reset_gpio, 0);
- }
-
- + /* Start by setting up the register mapping */
- + priv->regmap = devm_regmap_init(&mdiodev->dev, NULL, priv,
- + &qca8k_regmap_config);
- + if (IS_ERR(priv->regmap)) {
- + dev_err(priv->dev, "regmap initialization failed");
- + return PTR_ERR(priv->regmap);
- + }
- +
- /* Check the detected switch id */
- ret = qca8k_read_switch_id(priv);
- if (ret)
|
