Commit a82f67af authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller

net: dsa: Make dsa_switch_ops const

Now that we have properly encapsulated and made drivers utilize exported
functions, we can switch dsa_switch_ops to be a annotated with const.
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ab3d408d
...@@ -1453,7 +1453,7 @@ static enum dsa_tag_protocol b53_get_tag_protocol(struct dsa_switch *ds) ...@@ -1453,7 +1453,7 @@ static enum dsa_tag_protocol b53_get_tag_protocol(struct dsa_switch *ds)
return DSA_TAG_PROTO_NONE; return DSA_TAG_PROTO_NONE;
} }
static struct dsa_switch_ops b53_switch_ops = { static const struct dsa_switch_ops b53_switch_ops = {
.get_tag_protocol = b53_get_tag_protocol, .get_tag_protocol = b53_get_tag_protocol,
.setup = b53_setup, .setup = b53_setup,
.get_strings = b53_get_strings, .get_strings = b53_get_strings,
......
...@@ -977,7 +977,7 @@ static struct b53_io_ops bcm_sf2_io_ops = { ...@@ -977,7 +977,7 @@ static struct b53_io_ops bcm_sf2_io_ops = {
.write64 = bcm_sf2_core_write64, .write64 = bcm_sf2_core_write64,
}; };
static struct dsa_switch_ops bcm_sf2_ops = { static const struct dsa_switch_ops bcm_sf2_ops = {
.get_tag_protocol = bcm_sf2_sw_get_tag_protocol, .get_tag_protocol = bcm_sf2_sw_get_tag_protocol,
.setup = bcm_sf2_sw_setup, .setup = bcm_sf2_sw_setup,
.get_strings = b53_get_strings, .get_strings = b53_get_strings,
......
...@@ -252,7 +252,7 @@ mv88e6060_phy_write(struct dsa_switch *ds, int port, int regnum, u16 val) ...@@ -252,7 +252,7 @@ mv88e6060_phy_write(struct dsa_switch *ds, int port, int regnum, u16 val)
return reg_write(ds, addr, regnum, val); return reg_write(ds, addr, regnum, val);
} }
static struct dsa_switch_ops mv88e6060_switch_ops = { static const struct dsa_switch_ops mv88e6060_switch_ops = {
.get_tag_protocol = mv88e6060_get_tag_protocol, .get_tag_protocol = mv88e6060_get_tag_protocol,
.probe = mv88e6060_drv_probe, .probe = mv88e6060_drv_probe,
.setup = mv88e6060_setup, .setup = mv88e6060_setup,
......
...@@ -4361,7 +4361,7 @@ static int mv88e6xxx_port_mdb_dump(struct dsa_switch *ds, int port, ...@@ -4361,7 +4361,7 @@ static int mv88e6xxx_port_mdb_dump(struct dsa_switch *ds, int port,
return err; return err;
} }
static struct dsa_switch_ops mv88e6xxx_switch_ops = { static const struct dsa_switch_ops mv88e6xxx_switch_ops = {
.probe = mv88e6xxx_drv_probe, .probe = mv88e6xxx_drv_probe,
.get_tag_protocol = mv88e6xxx_get_tag_protocol, .get_tag_protocol = mv88e6xxx_get_tag_protocol,
.setup = mv88e6xxx_setup, .setup = mv88e6xxx_setup,
......
...@@ -911,7 +911,7 @@ qca8k_get_tag_protocol(struct dsa_switch *ds) ...@@ -911,7 +911,7 @@ qca8k_get_tag_protocol(struct dsa_switch *ds)
return DSA_TAG_PROTO_QCA; return DSA_TAG_PROTO_QCA;
} }
static struct dsa_switch_ops qca8k_switch_ops = { static const struct dsa_switch_ops qca8k_switch_ops = {
.get_tag_protocol = qca8k_get_tag_protocol, .get_tag_protocol = qca8k_get_tag_protocol,
.setup = qca8k_setup, .setup = qca8k_setup,
.get_strings = qca8k_get_strings, .get_strings = qca8k_get_strings,
......
...@@ -169,7 +169,7 @@ struct dsa_switch { ...@@ -169,7 +169,7 @@ struct dsa_switch {
/* /*
* The switch operations. * The switch operations.
*/ */
struct dsa_switch_ops *ops; const struct dsa_switch_ops *ops;
/* /*
* An array of which element [a] indicates which port on this * An array of which element [a] indicates which port on this
...@@ -390,7 +390,7 @@ struct dsa_switch_ops { ...@@ -390,7 +390,7 @@ struct dsa_switch_ops {
struct dsa_switch_driver { struct dsa_switch_driver {
struct list_head list; struct list_head list;
struct dsa_switch_ops *ops; const struct dsa_switch_ops *ops;
}; };
void register_switch_driver(struct dsa_switch_driver *type); void register_switch_driver(struct dsa_switch_driver *type);
......
...@@ -76,11 +76,11 @@ void unregister_switch_driver(struct dsa_switch_driver *drv) ...@@ -76,11 +76,11 @@ void unregister_switch_driver(struct dsa_switch_driver *drv)
} }
EXPORT_SYMBOL_GPL(unregister_switch_driver); EXPORT_SYMBOL_GPL(unregister_switch_driver);
static struct dsa_switch_ops * static const struct dsa_switch_ops *
dsa_switch_probe(struct device *parent, struct device *host_dev, int sw_addr, dsa_switch_probe(struct device *parent, struct device *host_dev, int sw_addr,
const char **_name, void **priv) const char **_name, void **priv)
{ {
struct dsa_switch_ops *ret; const struct dsa_switch_ops *ret;
struct list_head *list; struct list_head *list;
const char *name; const char *name;
...@@ -89,7 +89,7 @@ dsa_switch_probe(struct device *parent, struct device *host_dev, int sw_addr, ...@@ -89,7 +89,7 @@ dsa_switch_probe(struct device *parent, struct device *host_dev, int sw_addr,
mutex_lock(&dsa_switch_drivers_mutex); mutex_lock(&dsa_switch_drivers_mutex);
list_for_each(list, &dsa_switch_drivers) { list_for_each(list, &dsa_switch_drivers) {
struct dsa_switch_ops *ops; const struct dsa_switch_ops *ops;
struct dsa_switch_driver *drv; struct dsa_switch_driver *drv;
drv = list_entry(list, struct dsa_switch_driver, list); drv = list_entry(list, struct dsa_switch_driver, list);
...@@ -207,7 +207,7 @@ void dsa_cpu_port_ethtool_restore(struct dsa_switch *ds) ...@@ -207,7 +207,7 @@ void dsa_cpu_port_ethtool_restore(struct dsa_switch *ds)
static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent) static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
{ {
struct dsa_switch_ops *ops = ds->ops; const struct dsa_switch_ops *ops = ds->ops;
struct dsa_switch_tree *dst = ds->dst; struct dsa_switch_tree *dst = ds->dst;
struct dsa_chip_data *cd = ds->cd; struct dsa_chip_data *cd = ds->cd;
bool valid_name_found = false; bool valid_name_found = false;
...@@ -326,7 +326,7 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index, ...@@ -326,7 +326,7 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index,
struct device *parent, struct device *host_dev) struct device *parent, struct device *host_dev)
{ {
struct dsa_chip_data *cd = dst->pd->chip + index; struct dsa_chip_data *cd = dst->pd->chip + index;
struct dsa_switch_ops *ops; const struct dsa_switch_ops *ops;
struct dsa_switch *ds; struct dsa_switch *ds;
int ret; int ret;
const char *name; const char *name;
......
...@@ -86,7 +86,7 @@ static umode_t dsa_hwmon_attrs_visible(struct kobject *kobj, ...@@ -86,7 +86,7 @@ static umode_t dsa_hwmon_attrs_visible(struct kobject *kobj,
{ {
struct device *dev = container_of(kobj, struct device, kobj); struct device *dev = container_of(kobj, struct device, kobj);
struct dsa_switch *ds = dev_get_drvdata(dev); struct dsa_switch *ds = dev_get_drvdata(dev);
struct dsa_switch_ops *ops = ds->ops; const struct dsa_switch_ops *ops = ds->ops;
umode_t mode = attr->mode; umode_t mode = attr->mode;
if (index == 1) { if (index == 1) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment