system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-06 16:40:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

etherswitch: Use device_set_desc(f)()

Browse source 
No functional change intended.

MFC after:	1 week
This commit is contained in:
Mark Johnston 2024-02-04 18:41:22 -05:00
parent a1b8445115
commit 54482989d3
7 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sys/dev/etherswitch/arswitch/arswitch.c
View file

@ -95,7 +95,7 @@ arswitch_probe(device_t dev)
{ {
struct arswitch_softc *sc; struct arswitch_softc *sc;
uint32_t id; uint32_t id;
char *chipname, desc[256]; char *chipname;
sc = device_get_softc(dev); sc = device_get_softc(dev);
bzero(sc, sizeof(*sc)); bzero(sc, sizeof(*sc));
@ -132,12 +132,9 @@ arswitch_probe(device_t dev)
DPRINTF(sc, ARSWITCH_DBG_ANY, "chipname=%s, id=%08x\n", chipname, id); DPRINTF(sc, ARSWITCH_DBG_ANY, "chipname=%s, id=%08x\n", chipname, id);
if (chipname != NULL) { if (chipname != NULL) {
snprintf(desc, sizeof(desc), device_set_descf(dev,
"Atheros %s Ethernet Switch (ver %d rev %d)", "Atheros %s Ethernet Switch (ver %d rev %d)",
chipname, chipname, sc->chip_ver, sc->chip_rev);
sc->chip_ver,
sc->chip_rev);
device_set_desc_copy(dev, desc);
return (BUS_PROBE_DEFAULT); return (BUS_PROBE_DEFAULT);
} }
return (ENXIO); return (ENXIO);

4
sys/dev/etherswitch/e6000sw/e6060sw.c
View file

@ -162,7 +162,6 @@ e6060sw_probe(device_t dev)
struct e6060sw_softc *sc; struct e6060sw_softc *sc;
int devid, i; int devid, i;
char *devname; char *devname;
char desc[80];
sc = device_get_softc(dev); sc = device_get_softc(dev);
bzero(sc, sizeof(*sc)); bzero(sc, sizeof(*sc));
@ -193,9 +192,8 @@ e6060sw_probe(device_t dev)
else else
return (ENXIO); return (ENXIO);
sprintf(desc, "Marvell %s MDIO switch driver at 0x%02x", device_set_descf(dev, "Marvell %s MDIO switch driver at 0x%02x",
devname, sc->smi_offset); devname, sc->smi_offset);
device_set_desc_copy(dev, desc);
return (BUS_PROBE_DEFAULT); return (BUS_PROBE_DEFAULT);
} }

2
sys/dev/etherswitch/infineon/adm6996fc.c
View file

@ -153,7 +153,7 @@ adm6996fc_probe(device_t dev)
return (ENXIO); return (ENXIO);
} }
device_set_desc_copy(dev, "Infineon ADM6996FC/M/MX MDIO switch driver"); device_set_desc(dev, "Infineon ADM6996FC/M/MX MDIO switch driver");
return (BUS_PROBE_DEFAULT); return (BUS_PROBE_DEFAULT);
} }

2
sys/dev/etherswitch/ip17x/ip17x.c
View file

@ -152,7 +152,7 @@ ip17x_probe(device_t dev)
(void) resource_int_value(device_get_name(dev), device_get_unit(dev), (void) resource_int_value(device_get_name(dev), device_get_unit(dev),
"mii-poll", &sc->miipoll); "mii-poll", &sc->miipoll);
#endif #endif
device_set_desc_copy(dev, "IC+ IP17x switch driver"); device_set_desc(dev, "IC+ IP17x switch driver");
return (BUS_PROBE_DEFAULT); return (BUS_PROBE_DEFAULT);
} }

2
sys/dev/etherswitch/micrel/ksz8995ma.c
View file

@ -197,7 +197,7 @@ ksz8995ma_probe(device_t dev)
return (ENXIO); return (ENXIO);
} }
device_set_desc_copy(dev, "Micrel KSZ8995MA SPI switch driver"); device_set_desc(dev, "Micrel KSZ8995MA SPI switch driver");
return (BUS_PROBE_DEFAULT); return (BUS_PROBE_DEFAULT);
} }

2
sys/dev/etherswitch/mtkswitch/mtkswitch.c
View file

@ -100,7 +100,7 @@ mtkswitch_probe(device_t dev)
bzero(sc, sizeof(*sc)); bzero(sc, sizeof(*sc));
sc->sc_switchtype = switch_type; sc->sc_switchtype = switch_type;
device_set_desc_copy(dev, "MTK Switch Driver"); device_set_desc(dev, "MTK Switch Driver");
return (0); return (0);
} }

2
sys/dev/etherswitch/ukswitch/ukswitch.c
View file

@ -106,7 +106,7 @@ ukswitch_probe(device_t dev)
sc = device_get_softc(dev); sc = device_get_softc(dev);
bzero(sc, sizeof(*sc)); bzero(sc, sizeof(*sc));
device_set_desc_copy(dev, "Generic MDIO switch driver"); device_set_desc(dev, "Generic MDIO switch driver");
return (BUS_PROBE_DEFAULT); return (BUS_PROBE_DEFAULT);
} }