Skip to content

Commit

Permalink
net: dsa: Make dsa_switch_ops const
Browse files Browse the repository at this point in the history
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: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Florian Fainelli authored and David S. Miller committed Jan 9, 2017
1 parent ab3d408 commit a82f67a
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion drivers/net/dsa/b53/b53_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -1453,7 +1453,7 @@ static enum dsa_tag_protocol b53_get_tag_protocol(struct dsa_switch *ds)
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,
.setup = b53_setup,
.get_strings = b53_get_strings,
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/dsa/bcm_sf2.c
Original file line number Diff line number Diff line change
Expand Up @@ -977,7 +977,7 @@ static struct b53_io_ops bcm_sf2_io_ops = {
.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,
.setup = bcm_sf2_sw_setup,
.get_strings = b53_get_strings,
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/dsa/mv88e6060.c
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ mv88e6060_phy_write(struct dsa_switch *ds, int port, int regnum, u16 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,
.probe = mv88e6060_drv_probe,
.setup = mv88e6060_setup,
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/dsa/mv88e6xxx/chip.c
Original file line number Diff line number Diff line change
Expand Up @@ -4361,7 +4361,7 @@ static int mv88e6xxx_port_mdb_dump(struct dsa_switch *ds, int port,
return err;
}

static struct dsa_switch_ops mv88e6xxx_switch_ops = {
static const struct dsa_switch_ops mv88e6xxx_switch_ops = {
.probe = mv88e6xxx_drv_probe,
.get_tag_protocol = mv88e6xxx_get_tag_protocol,
.setup = mv88e6xxx_setup,
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/dsa/qca8k.c
Original file line number Diff line number Diff line change
Expand Up @@ -911,7 +911,7 @@ qca8k_get_tag_protocol(struct dsa_switch *ds)
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,
.setup = qca8k_setup,
.get_strings = qca8k_get_strings,
Expand Down
4 changes: 2 additions & 2 deletions include/net/dsa.h
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ struct dsa_switch {
/*
* 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
Expand Down Expand Up @@ -390,7 +390,7 @@ struct dsa_switch_ops {

struct dsa_switch_driver {
struct list_head list;
struct dsa_switch_ops *ops;
const struct dsa_switch_ops *ops;
};

void register_switch_driver(struct dsa_switch_driver *type);
Expand Down
10 changes: 5 additions & 5 deletions net/dsa/dsa.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ void unregister_switch_driver(struct dsa_switch_driver *drv)
}
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,
const char **_name, void **priv)
{
struct dsa_switch_ops *ret;
const struct dsa_switch_ops *ret;
struct list_head *list;
const char *name;

Expand All @@ -89,7 +89,7 @@ dsa_switch_probe(struct device *parent, struct device *host_dev, int sw_addr,

mutex_lock(&dsa_switch_drivers_mutex);
list_for_each(list, &dsa_switch_drivers) {
struct dsa_switch_ops *ops;
const struct dsa_switch_ops *ops;
struct dsa_switch_driver *drv;

drv = list_entry(list, struct dsa_switch_driver, list);
Expand Down Expand Up @@ -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)
{
struct dsa_switch_ops *ops = ds->ops;
const struct dsa_switch_ops *ops = ds->ops;
struct dsa_switch_tree *dst = ds->dst;
struct dsa_chip_data *cd = ds->cd;
bool valid_name_found = false;
Expand Down Expand Up @@ -326,7 +326,7 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index,
struct device *parent, struct device *host_dev)
{
struct dsa_chip_data *cd = dst->pd->chip + index;
struct dsa_switch_ops *ops;
const struct dsa_switch_ops *ops;
struct dsa_switch *ds;
int ret;
const char *name;
Expand Down
2 changes: 1 addition & 1 deletion net/dsa/hwmon.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ static umode_t dsa_hwmon_attrs_visible(struct kobject *kobj,
{
struct device *dev = container_of(kobj, struct device, kobj);
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;

if (index == 1) {
Expand Down

0 comments on commit a82f67a

Please sign in to comment.