diff options
| author |   Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2016-04-17 13:23:55 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-04-17 18:54:14 -0400 |
| commit | 0209d144e3097fee1fe5d38532e6f0919c80d1ea (patch) | |
| tree | 8be0d13a7ca618200f5d096f7c05e208ea377d17 /drivers/net/dsa/mv88e6060.c | |
| parent | Merge branch 'nfp-next' (diff) | |
| download | linux-dev-0209d144e3097fee1fe5d38532e6f0919c80d1ea.tar.xz linux-dev-0209d144e3097fee1fe5d38532e6f0919c80d1ea.zip | |
net: dsa: constify probed name
Change the dsa_switch_driver.probe function to return a const char *.
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/mv88e6060.c')
| -rw-r--r-- | drivers/net/dsa/mv88e6060.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/dsa/mv88e6060.c b/drivers/net/dsa/mv88e6060.c index 92cebab9383e..e36b40886bd8 100644 --- a/drivers/net/dsa/mv88e6060.c +++ b/drivers/net/dsa/mv88e6060.c @@ -51,7 +51,7 @@ static int reg_write(struct dsa_switch *ds, int addr, int reg, u16 val) return __ret; \ }) -static char *mv88e6060_get_name(struct mii_bus *bus, int sw_addr) +static const char *mv88e6060_get_name(struct mii_bus *bus, int sw_addr) { int ret; @@ -69,13 +69,13 @@ static char *mv88e6060_get_name(struct mii_bus *bus, int sw_addr) return NULL; } -static char *mv88e6060_drv_probe(struct device *dsa_dev, - struct device *host_dev, - int sw_addr, void **_priv) +static const char *mv88e6060_drv_probe(struct device *dsa_dev, + struct device *host_dev, int sw_addr, + void **_priv) { struct mii_bus *bus = dsa_host_dev_to_mii_bus(host_dev); struct mv88e6060_priv *priv; - char *name; + const char *name; name = mv88e6060_get_name(bus, sw_addr); if (name) { |