net: dsa: felix: remove felix_info :: init_regmap

It turns out that the idea of having a customizable implementation of a
regmap creation from a resource is not exactly useful. The idea was for
the new MFD-based VSC7512 driver to use something that creates a SPI
regmap from a resource. But there are problems in actually getting those
resources (it involves getting them from MFD).

To avoid all that, we'll be getting resources by name, so this custom
init_regmap() method won't be needed. Remove it.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c
index d2a9d292160c1a89dcb58171b825aa34d8c3abcd..b7a66c151be31efddb6a70cafd4519c0c9fa4171 100644 (file)
--- a/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
@@ -1360,7 +1360,7 @@ static int felix_init_structs(struct felix *felix, int num_phys_ports)
                res.start += felix->switch_base;
                res.end += felix->switch_base;
 
-               target = felix->info->init_regmap(ocelot, &res);
+               target = ocelot_regmap_init(ocelot, &res);
                if (IS_ERR(target)) {
                        dev_err(ocelot->dev,
                                "Failed to map device memory space\n");
@@ -1397,7 +1397,7 @@ static int felix_init_structs(struct felix *felix, int num_phys_ports)
                res.start += felix->switch_base;
                res.end += felix->switch_base;
 
-               target = felix->info->init_regmap(ocelot, &res);
+               target = ocelot_regmap_init(ocelot, &res);
                if (IS_ERR(target)) {
                        dev_err(ocelot->dev,
                                "Failed to map memory space for port %d\n",

diff --git a/drivers/net/dsa/ocelot/felix.h b/drivers/net/dsa/ocelot/felix.h
index 4921f5cc8170578fc243944024708793bf9fda1f..54322d0398fd912bb76086705abc8d22d49faa6f 100644 (file)
--- a/drivers/net/dsa/ocelot/felix.h
+++ b/drivers/net/dsa/ocelot/felix.h
@@ -55,8 +55,6 @@ struct felix_info {
        void    (*tas_guard_bands_update)(struct ocelot *ocelot, int port);
        void    (*port_sched_speed_set)(struct ocelot *ocelot, int port,
                                        u32 speed);
-       struct regmap *(*init_regmap)(struct ocelot *ocelot,
-                                     struct resource *res);
 };
 
 /* Methods for initializing the hardware resources specific to a tagging

diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
index 4ca9fbe197c71bb4ee5410215918773103d4b43d..e465e3f854679c50dce205179e9f643045313d0f 100644 (file)
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -2617,7 +2617,6 @@ static const struct felix_info felix_info_vsc9959 = {
        .port_setup_tc          = vsc9959_port_setup_tc,
        .port_sched_speed_set   = vsc9959_sched_speed_set,
        .tas_guard_bands_update = vsc9959_tas_guard_bands_update,
-       .init_regmap            = ocelot_regmap_init,
 };
 
 static irqreturn_t felix_irq_handler(int irq, void *data)

diff --git a/drivers/net/dsa/ocelot/seville_vsc9953.c b/drivers/net/dsa/ocelot/seville_vsc9953.c
index 5b29fa9306274bfb73fa358938bbde9ee63f7946..e807db0dea98a1cb4e5d257fb75053c81a250f8e 100644 (file)
--- a/drivers/net/dsa/ocelot/seville_vsc9953.c
+++ b/drivers/net/dsa/ocelot/seville_vsc9953.c
@@ -1078,7 +1078,6 @@ static const struct felix_info seville_info_vsc9953 = {
        .mdio_bus_free          = vsc9953_mdio_bus_free,
        .phylink_validate       = vsc9953_phylink_validate,
        .port_modes             = vsc9953_port_modes,
-       .init_regmap            = ocelot_regmap_init,
 };
 
 static int seville_probe(struct platform_device *pdev)