mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-10-18 02:19:39 +00:00
Code Issues Releases Activity

etherswitch: Stop checking for failures from malloc(M_WAITOK)

Browse Source 
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D45852

(cherry picked from commit 48741f4cec)
(cherry picked from commit e78c315e89)
This commit is contained in:
Zhenlei Huang 2024-09-03 18:25:27 +08:00
parent 568cb55925
commit f5f9d9d403
2 changed files with 8 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/dev/etherswitch/infineon/adm6996fc.c
View File

@ -185,10 +185,6 @@ adm6996fc_attach_phys(struct adm6996fc_softc *sc)
if_initname(sc->ifp[port], name, port);
sc->miibus[port] = malloc(sizeof(device_t), M_ADM6996FC,
M_WAITOK | M_ZERO);
if (sc->miibus[port] == NULL) {
err = ENOMEM;
goto failed;
}
err = mii_attach(sc->sc_dev, sc->miibus[port], sc->ifp[port],
adm6996fc_ifmedia_upd, adm6996fc_ifmedia_sts, \
BMSR_DEFCAPMASK, phy, MII_OFFSET_ANY, 0);
@ -261,12 +257,6 @@ adm6996fc_attach(device_t dev)
sc->portphy = malloc(sizeof(int) * sc->numports, M_ADM6996FC,
M_WAITOK | M_ZERO);
if (sc->ifp == NULL || sc->ifname == NULL || sc->miibus == NULL ||
sc->portphy == NULL) {
err = ENOMEM;
goto failed;
}
/*
* Attach the PHYs and complete the bus enumeration.
*/
@ -287,14 +277,10 @@ adm6996fc_attach(device_t dev)
return (0);
failed:
if (sc->portphy != NULL)
free(sc->portphy, M_ADM6996FC);
if (sc->miibus != NULL)
free(sc->miibus, M_ADM6996FC);
if (sc->ifname != NULL)
free(sc->ifname, M_ADM6996FC);
if (sc->ifp != NULL)
free(sc->ifp, M_ADM6996FC);
free(sc->portphy, M_ADM6996FC);
free(sc->miibus, M_ADM6996FC);
free(sc->ifname, M_ADM6996FC);
free(sc->ifp, M_ADM6996FC);
return (err);
}

22
sys/dev/etherswitch/micrel/ksz8995ma.c
View File

@ -231,10 +231,6 @@ ksz8995ma_attach_phys(struct ksz8995ma_softc *sc)
if_initname(sc->ifp[port], name, port);
sc->miibus[port] = malloc(sizeof(device_t), M_KSZ8995MA,
M_WAITOK | M_ZERO);
if (sc->miibus[port] == NULL) {
err = ENOMEM;
goto failed;
}
err = mii_attach(sc->sc_dev, sc->miibus[port], sc->ifp[port],
ksz8995ma_ifmedia_upd, ksz8995ma_ifmedia_sts, \
BMSR_DEFCAPMASK, phy, MII_OFFSET_ANY, 0);
@ -311,12 +307,6 @@ ksz8995ma_attach(device_t dev)
sc->portphy = malloc(sizeof(int) * sc->numports, M_KSZ8995MA,
M_WAITOK | M_ZERO);
if (sc->ifp == NULL || sc->ifname == NULL || sc->miibus == NULL ||
sc->portphy == NULL) {
err = ENOMEM;
goto failed;
}
/*
* Attach the PHYs and complete the bus enumeration.
*/
@ -345,14 +335,10 @@ ksz8995ma_attach(device_t dev)
return (0);
failed:
if (sc->portphy != NULL)
free(sc->portphy, M_KSZ8995MA);
if (sc->miibus != NULL)
free(sc->miibus, M_KSZ8995MA);
if (sc->ifname != NULL)
free(sc->ifname, M_KSZ8995MA);
if (sc->ifp != NULL)
free(sc->ifp, M_KSZ8995MA);
free(sc->portphy, M_KSZ8995MA);
free(sc->miibus, M_KSZ8995MA);
free(sc->ifname, M_KSZ8995MA);
free(sc->ifp, M_KSZ8995MA);
return (err);
}