Author: markj
Date: Mon Aug 3 23:06:33 2020
New Revision: 363815
URL: https://svnweb.freebsd.org/changeset/base/363815
Log:
MFC r363608:
mpr(4), mps(4): Stop checking for failures from malloc(M_WAITOK).
Modified:
stable/12/sys/dev/mpr/mpr.c
stable/12/sys/dev/mpr/mpr_sas.c
stable/12/sys/dev/mpr/mpr_user.c
stable/12/sys/dev/mps/mps.c
stable/12/sys/dev/mps/mps_sas.c
stable/12/sys/dev/mps/mps_user.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/dev/mpr/mpr.c
==============================================================================
--- stable/12/sys/dev/mpr/mpr.c Mon Aug 3 23:05:47 2020 (r363814)
+++ stable/12/sys/dev/mpr/mpr.c Mon Aug 3 23:06:33 2020 (r363815)
@@ -1562,10 +1562,6 @@ mpr_alloc_requests(struct mpr_softc *sc)
*/
sc->commands = malloc(sizeof(struct mpr_command) * sc->num_reqs,
M_MPR, M_WAITOK | M_ZERO);
- if (!sc->commands) {
- mpr_dprint(sc, MPR_ERROR, "Cannot allocate command memory\n");
- return (ENOMEM);
- }
for (i = 1; i < sc->num_reqs; i++) {
cm = &sc->commands[i];
cm->cm_req = sc->req_frames + i * sc->reqframesz;
@@ -2716,11 +2712,6 @@ mpr_register_events(struct mpr_softc *sc, uint8_t *mas
int error = 0;
eh = malloc(sizeof(struct mpr_event_handle), M_MPR, M_WAITOK|M_ZERO);
- if (!eh) {
- mpr_dprint(sc, MPR_EVENT|MPR_ERROR,
- "Cannot allocate event memory\n");
- return (ENOMEM);
- }
eh->callback = cb;
eh->data = data;
TAILQ_INSERT_TAIL(&sc->event_list, eh, eh_list);
Modified: stable/12/sys/dev/mpr/mpr_sas.c
==============================================================================
--- stable/12/sys/dev/mpr/mpr_sas.c Mon Aug 3 23:05:47 2020
(r363814)
+++ stable/12/sys/dev/mpr/mpr_sas.c Mon Aug 3 23:06:33 2020
(r363815)
@@ -755,11 +755,6 @@ mpr_attach_sas(struct mpr_softc *sc)
mpr_dprint(sc, MPR_INIT, "%s entered\n", __func__);
sassc = malloc(sizeof(struct mprsas_softc), M_MPR, M_WAITOK|M_ZERO);
- if (!sassc) {
- mpr_dprint(sc, MPR_INIT|MPR_ERROR,
- "Cannot allocate SAS subsystem memory\n");
- return (ENOMEM);
- }
/*
* XXX MaxTargets could change during a reinit. Since we don't
@@ -770,12 +765,6 @@ mpr_attach_sas(struct mpr_softc *sc)
sassc->maxtargets = sc->facts->MaxTargets + sc->facts->MaxVolumes;
sassc->targets = malloc(sizeof(struct mprsas_target) *
sassc->maxtargets, M_MPR, M_WAITOK|M_ZERO);
- if (!sassc->targets) {
- mpr_dprint(sc, MPR_INIT|MPR_ERROR,
- "Cannot allocate SAS target memory\n");
- free(sassc, M_MPR);
- return (ENOMEM);
- }
sc->sassc = sassc;
sassc->sc = sc;
@@ -3960,8 +3949,4 @@ mprsas_realloc_targets(struct mpr_softc *sc, int maxta
sassc->targets = malloc(sizeof(struct mprsas_target) * maxtargets,
M_MPR, M_WAITOK|M_ZERO);
- if (!sassc->targets) {
- panic("%s failed to alloc targets with error %d\n",
- __func__, ENOMEM);
- }
}
Modified: stable/12/sys/dev/mpr/mpr_user.c
==============================================================================
--- stable/12/sys/dev/mpr/mpr_user.c Mon Aug 3 23:05:47 2020
(r363814)
+++ stable/12/sys/dev/mpr/mpr_user.c Mon Aug 3 23:06:33 2020
(r363815)
@@ -1533,13 +1533,6 @@ mpr_diag_register(struct mpr_softc *sc, mpr_fw_diag_re
bzero(sc->fw_diag_buffer, buffer_size);
ctx = malloc(sizeof(*ctx), M_MPR, M_WAITOK | M_ZERO);
- if (ctx == NULL) {
- device_printf(sc->mpr_dev, "%s: context malloc failed\n",
- __func__);
- *return_code = MPR_FW_DIAG_ERROR_NO_BUFFER;
- status = MPR_DIAG_FAILURE;
- goto bailout;
- }
ctx->addr = &sc->fw_diag_busaddr;
ctx->buffer_dmat = sc->fw_diag_dmat;
ctx->buffer_dmamap = sc->fw_diag_map;
Modified: stable/12/sys/dev/mps/mps.c
==============================================================================
--- stable/12/sys/dev/mps/mps.c Mon Aug 3 23:05:47 2020 (r363814)
+++ stable/12/sys/dev/mps/mps.c Mon Aug 3 23:06:33 2020 (r363815)
@@ -1513,10 +1513,6 @@ mps_alloc_requests(struct mps_softc *sc)
*/
sc->commands = malloc(sizeof(struct mps_command) * sc->num_reqs,
M_MPT2, M_WAITOK | M_ZERO);
- if(!sc->commands) {
- mps_dprint(sc, MPS_ERROR, "Cannot allocate command memory\n");
- return (ENOMEM);
- }
for (i = 1; i < sc->num_reqs; i++) {
cm = &sc->commands[i];
cm->cm_req = sc->req_frames + i * sc->reqframesz;
@@ -2584,10 +2580,6 @@ mps_register_events(struct mps_softc *sc, u32 *mask,
int error = 0;
eh = malloc(sizeof(struct mps_event_handle), M_MPT2, M_WAITOK|M_ZERO);
- if(!eh) {
- mps_dprint(sc, MPS_ERROR, "Cannot allocate event memory\n");
- return (ENOMEM);
- }
eh->callback = cb;
eh->data = data;
TAILQ_INSERT_TAIL(&sc->event_list, eh, eh_list);
Modified: stable/12/sys/dev/mps/mps_sas.c
==============================================================================
--- stable/12/sys/dev/mps/mps_sas.c Mon Aug 3 23:05:47 2020
(r363814)
+++ stable/12/sys/dev/mps/mps_sas.c Mon Aug 3 23:06:33 2020
(r363815)
@@ -738,11 +738,6 @@ mps_attach_sas(struct mps_softc *sc)
mps_dprint(sc, MPS_INIT, "%s entered\n", __func__);
sassc = malloc(sizeof(struct mpssas_softc), M_MPT2, M_WAITOK|M_ZERO);
- if(!sassc) {
- mps_dprint(sc, MPS_INIT|MPS_ERROR,
- "Cannot allocate SAS controller memory\n");
- return (ENOMEM);
- }
/*
* XXX MaxTargets could change during a reinit. Since we don't
@@ -753,12 +748,6 @@ mps_attach_sas(struct mps_softc *sc)
sassc->maxtargets = sc->facts->MaxTargets + sc->facts->MaxVolumes;
sassc->targets = malloc(sizeof(struct mpssas_target) *
sassc->maxtargets, M_MPT2, M_WAITOK|M_ZERO);
- if(!sassc->targets) {
- mps_dprint(sc, MPS_INIT|MPS_ERROR,
- "Cannot allocate SAS target memory\n");
- free(sassc, M_MPT2);
- return (ENOMEM);
- }
sc->sassc = sassc;
sassc->sc = sc;
@@ -3671,8 +3660,4 @@ mpssas_realloc_targets(struct mps_softc *sc, int maxta
sassc->targets = malloc(sizeof(struct mpssas_target) * maxtargets,
M_MPT2, M_WAITOK|M_ZERO);
- if (!sassc->targets) {
- panic("%s failed to alloc targets with error %d\n",
- __func__, ENOMEM);
- }
}
Modified: stable/12/sys/dev/mps/mps_user.c
==============================================================================
--- stable/12/sys/dev/mps/mps_user.c Mon Aug 3 23:05:47 2020
(r363814)
+++ stable/12/sys/dev/mps/mps_user.c Mon Aug 3 23:06:33 2020
(r363815)
@@ -1436,13 +1436,6 @@ mps_diag_register(struct mps_softc *sc, mps_fw_diag_re
bzero(sc->fw_diag_buffer, buffer_size);
ctx = malloc(sizeof(*ctx), M_MPSUSER, M_WAITOK | M_ZERO);
- if (ctx == NULL) {
- device_printf(sc->mps_dev, "%s: context malloc failed\n",
- __func__);
- *return_code = MPS_FW_DIAG_ERROR_NO_BUFFER;
- status = MPS_DIAG_FAILURE;
- goto bailout;
- }
ctx->addr = &sc->fw_diag_busaddr;
ctx->buffer_dmat = sc->fw_diag_dmat;
ctx->buffer_dmamap = sc->fw_diag_map;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
