Page MenuHomeFreeBSD
Files F152451729

D5904.id15059.diff
No OneTemporary
Actions

D5904.id15059.diff
View Options

Index: sys/arm/samsung/exynos/chrome_kb.c
===================================================================
--- sys/arm/samsung/exynos/chrome_kb.c
+++ sys/arm/samsung/exynos/chrome_kb.c
@@ -895,9 +895,7 @@
sc = device_get_softc(dev);
- if (sc->keymap != NULL) {
- free(sc->keymap, M_DEVBUF);
- }
+ free(sc->keymap, M_DEVBUF);
return 0;
}
Index: sys/boot/kshim/bsd_kernel.c
===================================================================
--- sys/boot/kshim/bsd_kernel.c
+++ sys/boot/kshim/bsd_kernel.c
@@ -783,9 +783,7 @@
return (dev);
error:
- if (dev) {
- free(dev, M_DEVBUF);
- }
+ free(dev, M_DEVBUF);
return (NULL);
}
Index: sys/cam/ata/ata_xpt.c
===================================================================
--- sys/cam/ata/ata_xpt.c
+++ sys/cam/ata/ata_xpt.c
@@ -876,16 +876,12 @@
if (changed) {
bcopy(&softc->ident_data, ident_buf, sizeof(struct ata_params));
/* Clean up from previous instance of this device */
- if (path->device->serial_num != NULL) {
- free(path->device->serial_num, M_CAMXPT);
- path->device->serial_num = NULL;
- path->device->serial_num_len = 0;
- }
- if (path->device->device_id != NULL) {
- free(path->device->device_id, M_CAMXPT);
- path->device->device_id = NULL;
- path->device->device_id_len = 0;
- }
+ free(path->device->serial_num, M_CAMXPT);
+ path->device->serial_num = NULL;
+ path->device->serial_num_len = 0;
+ free(path->device->device_id, M_CAMXPT);
+ path->device->device_id = NULL;
+ path->device->device_id_len = 0;
path->device->serial_num =
(u_int8_t *)malloc((sizeof(ident_buf->serial) + 1),
M_CAMXPT, M_NOWAIT);
@@ -1216,11 +1212,9 @@
if (changed) {
bcopy(&softc->ident_data, ident_buf, sizeof(struct ata_params));
/* Clean up from previous instance of this device */
- if (path->device->device_id != NULL) {
- free(path->device->device_id, M_CAMXPT);
- path->device->device_id = NULL;
- path->device->device_id_len = 0;
- }
+ free(path->device->device_id, M_CAMXPT);
+ path->device->device_id = NULL;
+ path->device->device_id_len = 0;
path->device->device_id =
malloc(16, M_CAMXPT, M_NOWAIT);
if (path->device->device_id != NULL) {
Index: sys/cam/scsi/scsi_xpt.c
===================================================================
--- sys/cam/scsi/scsi_xpt.c
+++ sys/cam/scsi/scsi_xpt.c
@@ -960,11 +960,9 @@
serial_buf = NULL;
device = periph->path->device;
- if (device->serial_num != NULL) {
- free(device->serial_num, M_CAMXPT);
- device->serial_num = NULL;
- device->serial_num_len = 0;
- }
+ free(device->serial_num, M_CAMXPT);
+ device->serial_num = NULL;
+ device->serial_num_len = 0;
if (scsi_vpd_supported_page(periph, SVPD_UNIT_SERIAL_NUMBER))
serial_buf = (struct scsi_vpd_unit_serial_number *)
@@ -1361,9 +1359,7 @@
xpt_schedule(periph, priority);
goto out;
}
- if (lp) {
- free(lp, M_CAMXPT);
- }
+ free(lp, M_CAMXPT);
PROBE_SET_ACTION(softc, PROBE_INVALID);
xpt_release_ccb(done_ccb);
break;
@@ -1407,11 +1403,9 @@
page_list =
(struct scsi_vpd_supported_page_list *)csio->data_ptr;
- if (path->device->supported_vpds != NULL) {
- free(path->device->supported_vpds, M_CAMXPT);
- path->device->supported_vpds = NULL;
- path->device->supported_vpds_len = 0;
- }
+ free(path->device->supported_vpds, M_CAMXPT);
+ path->device->supported_vpds = NULL;
+ path->device->supported_vpds_len = 0;
if (page_list == NULL) {
/*
@@ -2498,10 +2492,8 @@
break;
case CDAI_TYPE_PHYS_PATH:
if (cdai->flags & CDAI_FLAG_STORE) {
- if (device->physpath != NULL) {
- free(device->physpath, M_CAMXPT);
- device->physpath = NULL;
- }
+ free(device->physpath, M_CAMXPT);
+ device->physpath = NULL;
device->physpath_len = cdai->bufsiz;
/* Clear existing buffer if zero length */
if (cdai->bufsiz == 0)
@@ -2524,10 +2516,8 @@
break;
case CDAI_TYPE_RCAPLONG:
if (cdai->flags & CDAI_FLAG_STORE) {
- if (device->rcap_buf != NULL) {
- free(device->rcap_buf, M_CAMXPT);
- device->rcap_buf = NULL;
- }
+ free(device->rcap_buf, M_CAMXPT);
+ device->rcap_buf = NULL;
device->rcap_len = cdai->bufsiz;
/* Clear existing buffer if zero length */
Index: sys/compat/svr4/svr4_misc.c
===================================================================
--- sys/compat/svr4/svr4_misc.c
+++ sys/compat/svr4/svr4_misc.c
@@ -301,10 +301,8 @@
auio.uio_resid = buflen;
auio.uio_offset = off;
- if (cookies) {
- free(cookies, M_TEMP);
- cookies = NULL;
- }
+ free(cookies, M_TEMP);
+ cookies = NULL;
#ifdef MAC
error = mac_vnode_check_readdir(td->td_ucred, vp);
Index: sys/crypto/via/padlock_hash.c
===================================================================
--- sys/crypto/via/padlock_hash.c
+++ sys/crypto/via/padlock_hash.c
@@ -185,14 +185,11 @@
static void
padlock_sha_free(struct padlock_sha_ctx *ctx)
{
-
- if (ctx->psc_buf != NULL) {
//bzero(ctx->psc_buf, ctx->psc_size);
- free(ctx->psc_buf, M_PADLOCK);
- ctx->psc_buf = NULL;
- ctx->psc_offset = 0;
- ctx->psc_size = 0;
- }
+ free(ctx->psc_buf, M_PADLOCK);
+ ctx->psc_buf = NULL;
+ ctx->psc_offset = 0;
+ ctx->psc_size = 0;
}
static void
Index: sys/dev/acpica/acpi_perf.c
===================================================================
--- sys/dev/acpica/acpi_perf.c
+++ sys/dev/acpica/acpi_perf.c
@@ -366,10 +366,8 @@
out:
if (error) {
- if (sc->px_states) {
- free(sc->px_states, M_ACPIPERF);
- sc->px_states = NULL;
- }
+ free(sc->px_states, M_ACPIPERF);
+ sc->px_states = NULL;
if (sc->perf_ctrl) {
bus_release_resource(sc->dev, sc->perf_ctrl_type, 0,
sc->perf_ctrl);
Index: sys/dev/acpica/acpi_thermal.c
===================================================================
--- sys/dev/acpica/acpi_thermal.c
+++ sys/dev/acpica/acpi_thermal.c
@@ -957,10 +957,8 @@
for (;;) {
/* If the number of devices has changed, re-evaluate. */
if (devclass_get_count(acpi_tz_devclass) != devcount) {
- if (devs != NULL) {
- free(devs, M_TEMP);
- free(sc, M_TEMP);
- }
+ free(devs, M_TEMP);
+ free(sc, M_TEMP);
devclass_get_devices(acpi_tz_devclass, &devs, &devcount);
sc = malloc(sizeof(struct acpi_tz_softc *) * devcount, M_TEMP,
M_WAITOK | M_ZERO);
Index: sys/dev/an/if_an.c
===================================================================
--- sys/dev/an/if_an.c
+++ sys/dev/an/if_an.c
@@ -2936,10 +2936,8 @@
ifp->if_drv_flags &= ~(IFF_DRV_RUNNING|IFF_DRV_OACTIVE);
- if (sc->an_flash_buffer) {
- free(sc->an_flash_buffer, M_DEVBUF);
- sc->an_flash_buffer = NULL;
- }
+ free(sc->an_flash_buffer, M_DEVBUF);
+ sc->an_flash_buffer = NULL;
}
static void
@@ -3755,10 +3753,8 @@
return cmdreset(ifp);
break;
case AIROFLSHSTFL:
- if (sc->an_flash_buffer) {
- free(sc->an_flash_buffer, M_DEVBUF);
- sc->an_flash_buffer = NULL;
- }
+ free(sc->an_flash_buffer, M_DEVBUF);
+ sc->an_flash_buffer = NULL;
sc->an_flash_buffer = malloc(FLASH_SIZE, M_DEVBUF, M_WAITOK);
if (sc->an_flash_buffer)
return setflashmode(ifp);
Index: sys/dev/ath/if_ath_lna_div.c
===================================================================
--- sys/dev/ath/if_ath_lna_div.c
+++ sys/dev/ath/if_ath_lna_div.c
@@ -130,10 +130,8 @@
int
ath_lna_div_detach(struct ath_softc *sc)
{
- if (sc->sc_lna_div != NULL) {
- free(sc->sc_lna_div, M_TEMP);
- sc->sc_lna_div = NULL;
- }
+ free(sc->sc_lna_div, M_TEMP);
+ sc->sc_lna_div = NULL;
sc->sc_dolnadiv = 0;
return (0);
}
Index: sys/dev/ath/if_ath_spectral.c
===================================================================
--- sys/dev/ath/if_ath_spectral.c
+++ sys/dev/ath/if_ath_spectral.c
@@ -137,9 +137,7 @@
if (! ath_hal_spectral_supported(sc->sc_ah))
return (0);
- if (sc->sc_spectral != NULL) {
- free(sc->sc_spectral, M_TEMP);
- }
+ free(sc->sc_spectral, M_TEMP);
return (0);
}
Index: sys/dev/atkbdc/atkbd.c
===================================================================
--- sys/dev/atkbdc/atkbd.c
+++ sys/dev/atkbdc/atkbd.c
@@ -458,10 +458,8 @@
free(accmap, M_DEVBUF);
if (fkeymap != NULL)
free(fkeymap, M_DEVBUF);
- if (kbd != NULL) {
- free(kbd, M_DEVBUF);
- *kbdp = NULL; /* insure ref doesn't leak to caller */
- }
+ free(kbd, M_DEVBUF);
+ *kbdp = NULL;
}
return error;
}
Index: sys/dev/bktr/msp34xx.c
===================================================================
--- sys/dev/bktr/msp34xx.c
+++ sys/dev/bktr/msp34xx.c
@@ -1222,10 +1222,8 @@
mtx_unlock(&Giant);
}
- if (client->msp3400c_info != NULL) {
- free(client->msp3400c_info, M_DEVBUF);
- client->msp3400c_info = NULL;
- }
+ free(client->msp3400c_info, M_DEVBUF);
+ client->msp3400c_info = NULL;
msp3400c_reset(client);
Index: sys/dev/bxe/bxe.c
===================================================================
--- sys/dev/bxe/bxe.c
+++ sys/dev/bxe/bxe.c
@@ -6069,19 +6069,15 @@
static void
bxe_free_ilt_mem(struct bxe_softc *sc)
{
- if (sc->ilt != NULL) {
- free(sc->ilt, M_BXE_ILT);
- sc->ilt = NULL;
- }
+ free(sc->ilt, M_BXE_ILT);
+ sc->ilt = NULL;
}
static void
bxe_free_ilt_lines_mem(struct bxe_softc *sc)
{
- if (sc->ilt->lines != NULL) {
- free(sc->ilt->lines, M_BXE_ILT);
- sc->ilt->lines = NULL;
- }
+ free(sc->ilt->lines, M_BXE_ILT);
+ sc->ilt->lines = NULL;
}
static void
Index: sys/dev/ciss/ciss.c
===================================================================
--- sys/dev/ciss/ciss.c
+++ sys/dev/ciss/ciss.c
@@ -1283,10 +1283,8 @@
out:
if (error) {
- if (sc->ciss_id != NULL) {
- free(sc->ciss_id, CISS_MALLOC_CLASS);
- sc->ciss_id = NULL;
- }
+ free(sc->ciss_id, CISS_MALLOC_CLASS);
+ sc->ciss_id = NULL;
}
if (cr != NULL)
ciss_release_request(cr);
@@ -1778,14 +1776,10 @@
if (error != 0) {
/* make the drive not-exist */
ld->cl_status = CISS_LD_NONEXISTENT;
- if (ld->cl_ldrive != NULL) {
- free(ld->cl_ldrive, CISS_MALLOC_CLASS);
- ld->cl_ldrive = NULL;
- }
- if (ld->cl_lstatus != NULL) {
- free(ld->cl_lstatus, CISS_MALLOC_CLASS);
- ld->cl_lstatus = NULL;
- }
+ free(ld->cl_ldrive, CISS_MALLOC_CLASS);
+ ld->cl_ldrive = NULL;
+ free(ld->cl_lstatus, CISS_MALLOC_CLASS);
+ ld->cl_lstatus = NULL;
}
if (cr != NULL)
ciss_release_request(cr);
Index: sys/dev/cxgb/cxgb_sge.c
===================================================================
--- sys/dev/cxgb/cxgb_sge.c
+++ sys/dev/cxgb/cxgb_sge.c
@@ -2011,9 +2011,7 @@
bus_dma_tag_destroy(q->txq[i].desc_tag);
bus_dma_tag_destroy(q->txq[i].entry_tag);
}
- if (q->txq[i].sdesc) {
- free(q->txq[i].sdesc, M_DEVBUF);
- }
+ free(q->txq[i].sdesc, M_DEVBUF);
}
if (q->rspq.desc) {
Index: sys/dev/cy/cy.c
===================================================================
--- sys/dev/cy/cy.c
+++ sys/dev/cy/cy.c
@@ -1572,10 +1572,8 @@
critical_exit();
splx(s);
cystart(tp);
- if (com->ibufold != NULL) {
- free(com->ibufold, M_DEVBUF);
- com->ibufold = NULL;
- }
+ free(com->ibufold, M_DEVBUF);
+ com->ibufold = NULL;
return (0);
}
Index: sys/dev/digi/digi.c
===================================================================
--- sys/dev/digi/digi.c
+++ sys/dev/digi/digi.c
@@ -167,18 +167,12 @@
static void
digi_freemoduledata(struct digi_softc *sc)
{
- if (sc->fep.data != NULL) {
- free(sc->fep.data, M_TTYS);
- sc->fep.data = NULL;
- }
- if (sc->link.data != NULL) {
- free(sc->link.data, M_TTYS);
- sc->link.data = NULL;
- }
- if (sc->bios.data != NULL) {
- free(sc->bios.data, M_TTYS);
- sc->bios.data = NULL;
- }
+ free(sc->fep.data, M_TTYS);
+ sc->fep.data = NULL;
+ free(sc->link.data, M_TTYS);
+ sc->link.data = NULL;
+ free(sc->bios.data, M_TTYS);
+ sc->bios.data = NULL;
}
static int
Index: sys/dev/drm/drm_drv.c
===================================================================
--- sys/dev/drm/drm_drv.c
+++ sys/dev/drm/drm_drv.c
@@ -343,11 +343,9 @@
if (dev->irq_enabled)
drm_irq_uninstall(dev);
- if (dev->unique) {
- free(dev->unique, DRM_MEM_DRIVER);
- dev->unique = NULL;
- dev->unique_len = 0;
- }
+ free(dev->unique, DRM_MEM_DRIVER);
+ dev->unique = NULL;
+ dev->unique_len = 0;
/* Clear pid list */
for (i = 0; i < DRM_HASH_SIZE; i++) {
for (pt = dev->magiclist[i].head; pt; pt = next) {
@@ -536,10 +534,8 @@
dev->pcir[i] = NULL;
}
- if (dev->agp) {
- free(dev->agp, DRM_MEM_AGPLISTS);
- dev->agp = NULL;
- }
+ free(dev->agp, DRM_MEM_AGPLISTS);
+ dev->agp = NULL;
if (dev->driver->unload != NULL) {
DRM_LOCK();
Index: sys/dev/drm2/drm_stub.c
===================================================================
--- sys/dev/drm2/drm_stub.c
+++ sys/dev/drm2/drm_stub.c
@@ -147,11 +147,9 @@
}
}
- if (master->unique) {
- free(master->unique, DRM_MEM_DRIVER);
- master->unique = NULL;
- master->unique_len = 0;
- }
+ free(master->unique, DRM_MEM_DRIVER);
+ master->unique = NULL;
+ master->unique_len = 0;
list_for_each_entry_safe(pt, next, &master->magicfree, head) {
list_del(&pt->head);
Index: sys/dev/drm2/i915/dvo_ch7017.c
===================================================================
--- sys/dev/drm2/i915/dvo_ch7017.c
+++ sys/dev/drm2/i915/dvo_ch7017.c
@@ -400,10 +400,8 @@
{
struct ch7017_priv *priv = dvo->dev_priv;
- if (priv) {
- free(priv, DRM_MEM_KMS);
- dvo->dev_priv = NULL;
- }
+ free(priv, DRM_MEM_KMS);
+ dvo->dev_priv = NULL;
}
struct intel_dvo_dev_ops ch7017_ops = {
Index: sys/dev/drm2/i915/dvo_ch7xxx.c
===================================================================
--- sys/dev/drm2/i915/dvo_ch7xxx.c
+++ sys/dev/drm2/i915/dvo_ch7xxx.c
@@ -329,10 +329,8 @@
{
struct ch7xxx_priv *ch7xxx = dvo->dev_priv;
- if (ch7xxx) {
- free(ch7xxx, DRM_MEM_KMS);
- dvo->dev_priv = NULL;
- }
+ free(ch7xxx, DRM_MEM_KMS);
+ dvo->dev_priv = NULL;
}
struct intel_dvo_dev_ops ch7xxx_ops = {
Index: sys/dev/drm2/i915/dvo_ivch.c
===================================================================
--- sys/dev/drm2/i915/dvo_ivch.c
+++ sys/dev/drm2/i915/dvo_ivch.c
@@ -421,10 +421,8 @@
{
struct ivch_priv *priv = dvo->dev_priv;
- if (priv) {
- free(priv, DRM_MEM_KMS);
- dvo->dev_priv = NULL;
- }
+ free(priv, DRM_MEM_KMS);
+ dvo->dev_priv = NULL;
}
struct intel_dvo_dev_ops ivch_ops = {
Index: sys/dev/drm2/i915/dvo_ns2501.c
===================================================================
--- sys/dev/drm2/i915/dvo_ns2501.c
+++ sys/dev/drm2/i915/dvo_ns2501.c
@@ -583,10 +583,8 @@
{
struct ns2501_priv *ns = dvo->dev_priv;
- if (ns) {
- free(ns, DRM_MEM_KMS);
- dvo->dev_priv = NULL;
- }
+ free(ns, DRM_MEM_KMS);
+ dvo->dev_priv = NULL;
}
struct intel_dvo_dev_ops ns2501_ops = {
Index: sys/dev/drm2/i915/dvo_sil164.c
===================================================================
--- sys/dev/drm2/i915/dvo_sil164.c
+++ sys/dev/drm2/i915/dvo_sil164.c
@@ -264,10 +264,8 @@
{
struct sil164_priv *sil = dvo->dev_priv;
- if (sil) {
- free(sil, DRM_MEM_KMS);
- dvo->dev_priv = NULL;
- }
+ free(sil, DRM_MEM_KMS);
+ dvo->dev_priv = NULL;
}
struct intel_dvo_dev_ops sil164_ops = {
Index: sys/dev/drm2/i915/dvo_tfp410.c
===================================================================
--- sys/dev/drm2/i915/dvo_tfp410.c
+++ sys/dev/drm2/i915/dvo_tfp410.c
@@ -303,10 +303,8 @@
{
struct tfp410_priv *tfp = dvo->dev_priv;
- if (tfp) {
- free(tfp, DRM_MEM_KMS);
- dvo->dev_priv = NULL;
- }
+ free(tfp, DRM_MEM_KMS);
+ dvo->dev_priv = NULL;
}
struct intel_dvo_dev_ops tfp410_ops = {
Index: sys/dev/drm2/radeon/radeon_connectors.c
===================================================================
--- sys/dev/drm2/radeon/radeon_connectors.c
+++ sys/dev/drm2/radeon/radeon_connectors.c
@@ -752,10 +752,8 @@
dret = radeon_ddc_probe(radeon_connector, false);
if (dret) {
radeon_connector->detected_by_load = false;
- if (radeon_connector->edid) {
- free(radeon_connector->edid, DRM_MEM_KMS);
- radeon_connector->edid = NULL;
- }
+ free(radeon_connector->edid, DRM_MEM_KMS);
+ radeon_connector->edid = NULL;
radeon_connector->edid = drm_get_edid(&radeon_connector->base, radeon_connector->ddc_bus->adapter);
if (!radeon_connector->edid) {
@@ -958,10 +956,8 @@
dret = radeon_ddc_probe(radeon_connector, false);
if (dret) {
radeon_connector->detected_by_load = false;
- if (radeon_connector->edid) {
- free(radeon_connector->edid, DRM_MEM_KMS);
- radeon_connector->edid = NULL;
- }
+ free(radeon_connector->edid, DRM_MEM_KMS);
+ radeon_connector->edid = NULL;
radeon_connector->edid = drm_get_edid(&radeon_connector->base, radeon_connector->ddc_bus->adapter);
if (!radeon_connector->edid) {
@@ -1376,10 +1372,8 @@
if (!force && radeon_check_hpd_status_unchanged(connector))
return connector->status;
- if (radeon_connector->edid) {
- free(radeon_connector->edid, DRM_MEM_KMS);
- radeon_connector->edid = NULL;
- }
+ free(radeon_connector->edid, DRM_MEM_KMS);
+ radeon_connector->edid = NULL;
if ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) ||
(connector->connector_type == DRM_MODE_CONNECTOR_LVDS)) {
Index: sys/dev/e1000/if_em.c
===================================================================
--- sys/dev/e1000/if_em.c
+++ sys/dev/e1000/if_em.c
@@ -3826,10 +3826,8 @@
if (txr->br != NULL)
buf_ring_free(txr->br, M_DEVBUF);
#endif
- if (txr->tx_buffers != NULL) {
- free(txr->tx_buffers, M_DEVBUF);
- txr->tx_buffers = NULL;
- }
+ free(txr->tx_buffers, M_DEVBUF);
+ txr->tx_buffers = NULL;
if (txr->txtag != NULL) {
bus_dma_tag_destroy(txr->txtag);
txr->txtag = NULL;
Index: sys/dev/e1000/if_igb.c
===================================================================
--- sys/dev/e1000/if_igb.c
+++ sys/dev/e1000/if_igb.c
@@ -3747,10 +3747,8 @@
if (txr->br != NULL)
buf_ring_free(txr->br, M_DEVBUF);
#endif
- if (txr->tx_buffers != NULL) {
- free(txr->tx_buffers, M_DEVBUF);
- txr->tx_buffers = NULL;
- }
+ free(txr->tx_buffers, M_DEVBUF);
+ txr->tx_buffers = NULL;
if (txr->txtag != NULL) {
bus_dma_tag_destroy(txr->txtag);
txr->txtag = NULL;
@@ -4872,10 +4870,8 @@
rxbuf->pmap = NULL;
}
}
- if (rxr->rx_buffers != NULL) {
- free(rxr->rx_buffers, M_DEVBUF);
- rxr->rx_buffers = NULL;
- }
+ free(rxr->rx_buffers, M_DEVBUF);
+ rxr->rx_buffers = NULL;
}
if (rxr->htag != NULL) {
Index: sys/dev/e1000/if_lem.c
===================================================================
--- sys/dev/e1000/if_lem.c
+++ sys/dev/e1000/if_lem.c
@@ -2905,10 +2905,8 @@
}
}
}
- if (adapter->tx_buffer_area != NULL) {
- free(adapter->tx_buffer_area, M_DEVBUF);
- adapter->tx_buffer_area = NULL;
- }
+ free(adapter->tx_buffer_area, M_DEVBUF);
+ adapter->tx_buffer_area = NULL;
if (adapter->txtag != NULL) {
bus_dma_tag_destroy(adapter->txtag);
adapter->txtag = NULL;
@@ -3534,10 +3532,8 @@
}
}
- if (adapter->rx_buffer_area != NULL) {
- free(adapter->rx_buffer_area, M_DEVBUF);
- adapter->rx_buffer_area = NULL;
- }
+ free(adapter->rx_buffer_area, M_DEVBUF);
+ adapter->rx_buffer_area = NULL;
if (adapter->rxtag != NULL) {
bus_dma_tag_destroy(adapter->rxtag);
Index: sys/dev/fb/vesa.c
===================================================================
--- sys/dev/fb/vesa.c
+++ sys/dev/fb/vesa.c
@@ -1066,30 +1066,18 @@
x86bios_free(vesa_bios, vesa_bios_size);
vesa_bios = NULL;
}
- if (vesa_adp_info != NULL) {
- free(vesa_adp_info, M_DEVBUF);
- vesa_adp_info = NULL;
- }
- if (vesa_oemstr != NULL) {
- free(vesa_oemstr, M_DEVBUF);
- vesa_oemstr = NULL;
- }
- if (vesa_venderstr != NULL) {
- free(vesa_venderstr, M_DEVBUF);
- vesa_venderstr = NULL;
- }
- if (vesa_prodstr != NULL) {
- free(vesa_prodstr, M_DEVBUF);
- vesa_prodstr = NULL;
- }
- if (vesa_revstr != NULL) {
- free(vesa_revstr, M_DEVBUF);
- vesa_revstr = NULL;
- }
- if (vesa_vmode != NULL) {
- free(vesa_vmode, M_DEVBUF);
- vesa_vmode = NULL;
- }
+ free(vesa_adp_info, M_DEVBUF);
+ vesa_adp_info = NULL;
+ free(vesa_oemstr, M_DEVBUF);
+ vesa_oemstr = NULL;
+ free(vesa_venderstr, M_DEVBUF);
+ vesa_venderstr = NULL;
+ free(vesa_prodstr, M_DEVBUF);
+ vesa_prodstr = NULL;
+ free(vesa_revstr, M_DEVBUF);
+ vesa_revstr = NULL;
+ free(vesa_vmode, M_DEVBUF);
+ vesa_vmode = NULL;
if (vesa_palette != NULL) {
x86bios_free(vesa_palette,
VESA_PALETTE_SIZE + vesa_state_buf_size);
@@ -1474,10 +1462,8 @@
if (vesa_state_buf_size > 0 && size < bsize)
return (EINVAL);
- if (vesa_vmem_buf != NULL) {
- free(vesa_vmem_buf, M_DEVBUF);
- vesa_vmem_buf = NULL;
- }
+ free(vesa_vmem_buf, M_DEVBUF);
+ vesa_vmem_buf = NULL;
if (VESA_MODE(adp->va_mode)) {
buf = (void *)adp->va_buffer;
if (buf != NULL) {
Index: sys/dev/firewire/sbp_targ.c
===================================================================
--- sys/dev/firewire/sbp_targ.c
+++ sys/dev/firewire/sbp_targ.c
@@ -1167,10 +1167,8 @@
orbi->ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
if (debug)
printf("%s: free orbi->page_table %p due to xfer == NULL\n", __func__, orbi->page_table);
- if (orbi->page_table != NULL) {
- free(orbi->page_table, M_SBP_TARG);
- orbi->page_table = NULL;
- }
+ free(orbi->page_table, M_SBP_TARG);
+ orbi->page_table = NULL;
xpt_done(orbi->ccb);
return;
}
Index: sys/dev/gpio/gpiobus.c
===================================================================
--- sys/dev/gpio/gpiobus.c
+++ sys/dev/gpio/gpiobus.c
@@ -223,14 +223,10 @@
gpiobus_free_ivars(struct gpiobus_ivar *devi)
{
- if (devi->flags) {
- free(devi->flags, M_DEVBUF);
- devi->flags = NULL;
- }
- if (devi->pins) {
- free(devi->pins, M_DEVBUF);
- devi->pins = NULL;
- }
+ free(devi->flags, M_DEVBUF);
+ devi->flags = NULL;
+ free(devi->pins, M_DEVBUF);
+ devi->pins = NULL;
}
int
Index: sys/dev/hwpmc/hwpmc_mod.c
===================================================================
--- sys/dev/hwpmc/hwpmc_mod.c
+++ sys/dev/hwpmc/hwpmc_mod.c
@@ -5156,15 +5156,10 @@
free(pmc_pcpu_saved, M_PMC);
pmc_pcpu_saved = NULL;
- if (pmc_pmcdisp) {
- free(pmc_pmcdisp, M_PMC);
- pmc_pmcdisp = NULL;
- }
-
- if (pmc_rowindex_to_classdep) {
- free(pmc_rowindex_to_classdep, M_PMC);
- pmc_rowindex_to_classdep = NULL;
- }
+ free(pmc_pmcdisp, M_PMC);
+ pmc_pmcdisp = NULL;
+ free(pmc_rowindex_to_classdep, M_PMC);
+ pmc_rowindex_to_classdep = NULL;
pmclog_shutdown();
Index: sys/dev/hyperv/netvsc/hv_net_vsc.c
===================================================================
--- sys/dev/hyperv/netvsc/hv_net_vsc.c
+++ sys/dev/hyperv/netvsc/hv_net_vsc.c
@@ -394,11 +394,9 @@
net_dev->rx_buf = NULL;
}
- if (net_dev->rx_sections) {
- free(net_dev->rx_sections, M_NETVSC);
- net_dev->rx_sections = NULL;
- net_dev->rx_section_count = 0;
- }
+ free(net_dev->rx_sections, M_NETVSC);
+ net_dev->rx_sections = NULL;
+ net_dev->rx_section_count = 0;
return (ret);
}
@@ -462,9 +460,7 @@
net_dev->send_buf = NULL;
}
- if (net_dev->send_section_bitsmap) {
- free(net_dev->send_section_bitsmap, M_NETVSC);
- }
+ free(net_dev->send_section_bitsmap, M_NETVSC);
return (ret);
}
Index: sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
===================================================================
--- sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
+++ sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
@@ -1117,10 +1117,7 @@
sgl_node = LIST_FIRST(&g_hv_sgl_page_pool.free_sgl_list);
LIST_REMOVE(sgl_node, link);
for (j = 0; j < HV_MAX_MULTIPAGE_BUFFER_COUNT; j++) {
- if (NULL !=
- (void*)sgl_node->sgl_data->sg_segs[j].ss_paddr) {
- free((void*)sgl_node->sgl_data->sg_segs[j].ss_paddr, M_DEVBUF);
- }
+ free((void*)sgl_node->sgl_data->sg_segs[j].ss_paddr, M_DEVBUF);
}
sglist_free(sgl_node->sgl_data);
free(sgl_node, M_DEVBUF);
@@ -1181,10 +1178,7 @@
sgl_node = LIST_FIRST(&g_hv_sgl_page_pool.free_sgl_list);
LIST_REMOVE(sgl_node, link);
for (j = 0; j < HV_MAX_MULTIPAGE_BUFFER_COUNT; j++){
- if (NULL !=
- (void*)sgl_node->sgl_data->sg_segs[j].ss_paddr) {
- free((void*)sgl_node->sgl_data->sg_segs[j].ss_paddr, M_DEVBUF);
- }
+ free((void*)sgl_node->sgl_data->sg_segs[j].ss_paddr, M_DEVBUF);
}
sglist_free(sgl_node->sgl_data);
free(sgl_node, M_DEVBUF);
Index: sys/dev/hyperv/vmbus/hv_connection.c
===================================================================
--- sys/dev/hyperv/vmbus/hv_connection.c
+++ sys/dev/hyperv/vmbus/hv_connection.c
@@ -248,10 +248,8 @@
mtx_destroy(&hv_vmbus_g_connection.channel_lock);
mtx_destroy(&hv_vmbus_g_connection.channel_msg_lock);
- if (hv_vmbus_g_connection.interrupt_page != NULL) {
- free(hv_vmbus_g_connection.interrupt_page, M_DEVBUF);
- hv_vmbus_g_connection.interrupt_page = NULL;
- }
+ free(hv_vmbus_g_connection.interrupt_page, M_DEVBUF);
+ hv_vmbus_g_connection.interrupt_page = NULL;
free(hv_vmbus_g_connection.monitor_page_1, M_DEVBUF);
free(hv_vmbus_g_connection.monitor_page_2, M_DEVBUF);
Index: sys/dev/iscsi_initiator/isc_subr.c
===================================================================
--- sys/dev/iscsi_initiator/isc_subr.c
+++ sys/dev/iscsi_initiator/isc_subr.c
@@ -255,16 +255,10 @@
{
debug_called(8);
- if(opt->targetAddress != NULL) {
- free(opt->targetAddress, M_ISC);
- opt->targetAddress = NULL;
- }
- if(opt->targetName != NULL) {
- free(opt->targetName, M_ISC);
- opt->targetName = NULL;
- }
- if(opt->initiatorName != NULL) {
- free(opt->initiatorName, M_ISC);
- opt->initiatorName = NULL;
- }
+ free(opt->targetAddress, M_ISC);
+ opt->targetAddress = NULL;
+ free(opt->targetName, M_ISC);
+ opt->targetName = NULL;
+ free(opt->initiatorName, M_ISC);
+ opt->initiatorName = NULL;
}
Index: sys/dev/iscsi_initiator/iscsi_subr.c
===================================================================
--- sys/dev/iscsi_initiator/iscsi_subr.c
+++ sys/dev/iscsi_initiator/iscsi_subr.c
@@ -326,20 +326,16 @@
if(pq->ccb)
_scsi_done(sp, 1, 0x40, pq->ccb, NULL);
TAILQ_REMOVE(&sp->hld, pq, pq_link);
- if(pq->buf) {
- free(pq->buf, M_ISCSIBUF);
- pq->buf = NULL;
- }
+ free(pq->buf, M_ISCSIBUF);
+ pq->buf = NULL;
pdu_free(sp->isc, pq);
}
while((pq = i_dqueue_snd(sp, BIT(0)|BIT(1)|BIT(2))) != NULL) {
sdebug(3, "pq=%p", pq);
if(pq->ccb)
_scsi_done(sp, 1, 0x40, pq->ccb, NULL);
- if(pq->buf) {
- free(pq->buf, M_ISCSIBUF);
- pq->buf = NULL;
- }
+ free(pq->buf, M_ISCSIBUF);
+ pq->buf = NULL;
pdu_free(sp->isc, pq);
}
Index: sys/dev/isp/isp_pci.c
===================================================================
--- sys/dev/isp/isp_pci.c
+++ sys/dev/isp/isp_pci.c
@@ -1025,14 +1025,10 @@
(void) bus_release_resource(dev, pcs->rtp1, pcs->rgd1, pcs->regs1);
if (pcs->regs2)
(void) bus_release_resource(dev, pcs->rtp2, pcs->rgd2, pcs->regs2);
- if (pcs->pci_isp.isp_param) {
- free(pcs->pci_isp.isp_param, M_DEVBUF);
- pcs->pci_isp.isp_param = NULL;
- }
- if (pcs->pci_isp.isp_osinfo.pc.ptr) {
- free(pcs->pci_isp.isp_osinfo.pc.ptr, M_DEVBUF);
- pcs->pci_isp.isp_osinfo.pc.ptr = NULL;
- }
+ free(pcs->pci_isp.isp_param, M_DEVBUF);
+ pcs->pci_isp.isp_param = NULL;
+ free(pcs->pci_isp.isp_osinfo.pc.ptr, M_DEVBUF);
+ pcs->pci_isp.isp_osinfo.pc.ptr = NULL;
return (ENXIO);
}
@@ -1070,14 +1066,10 @@
/*
* XXX: THERE IS A LOT OF LEAKAGE HERE
*/
- if (pcs->pci_isp.isp_param) {
- free(pcs->pci_isp.isp_param, M_DEVBUF);
- pcs->pci_isp.isp_param = NULL;
- }
- if (pcs->pci_isp.isp_osinfo.pc.ptr) {
- free(pcs->pci_isp.isp_osinfo.pc.ptr, M_DEVBUF);
- pcs->pci_isp.isp_osinfo.pc.ptr = NULL;
- }
+ free(pcs->pci_isp.isp_param, M_DEVBUF);
+ pcs->pci_isp.isp_param = NULL;
+ free(pcs->pci_isp.isp_osinfo.pc.ptr, M_DEVBUF);
+ pcs->pci_isp.isp_osinfo.pc.ptr = NULL;
return (0);
}
Index: sys/dev/ixgb/if_ixgb.c
===================================================================
--- sys/dev/ixgb/if_ixgb.c
+++ sys/dev/ixgb/if_ixgb.c
@@ -1612,10 +1612,8 @@
tx_buffer->m_head = NULL;
}
}
- if (adapter->tx_buffer_area != NULL) {
- free(adapter->tx_buffer_area, M_DEVBUF);
- adapter->tx_buffer_area = NULL;
- }
+ free(adapter->tx_buffer_area, M_DEVBUF);
+ adapter->tx_buffer_area = NULL;
if (adapter->txtag != NULL) {
bus_dma_tag_destroy(adapter->txtag);
adapter->txtag = NULL;
@@ -2044,10 +2042,8 @@
rx_buffer->m_head = NULL;
}
}
- if (adapter->rx_buffer_area != NULL) {
- free(adapter->rx_buffer_area, M_DEVBUF);
- adapter->rx_buffer_area = NULL;
- }
+ free(adapter->rx_buffer_area, M_DEVBUF);
+ adapter->rx_buffer_area = NULL;
if (adapter->rxtag != NULL) {
bus_dma_tag_destroy(adapter->rxtag);
adapter->rxtag = NULL;
Index: sys/dev/ixgbe/ix_txrx.c
===================================================================
--- sys/dev/ixgbe/ix_txrx.c
+++ sys/dev/ixgbe/ix_txrx.c
@@ -702,10 +702,8 @@
if (txr->br != NULL)
buf_ring_free(txr->br, M_DEVBUF);
#endif
- if (txr->tx_buffers != NULL) {
- free(txr->tx_buffers, M_DEVBUF);
- txr->tx_buffers = NULL;
- }
+ free(txr->tx_buffers, M_DEVBUF);
+ txr->tx_buffers = NULL;
if (txr->txtag != NULL) {
bus_dma_tag_destroy(txr->txtag);
txr->txtag = NULL;
@@ -1658,10 +1656,8 @@
rxbuf->pmap = NULL;
}
}
- if (rxr->rx_buffers != NULL) {
- free(rxr->rx_buffers, M_DEVBUF);
- rxr->rx_buffers = NULL;
- }
+ free(rxr->rx_buffers, M_DEVBUF);
+ rxr->rx_buffers = NULL;
}
if (rxr->ptag != NULL) {
Index: sys/dev/ixl/ixl_txrx.c
===================================================================
--- sys/dev/ixl/ixl_txrx.c
+++ sys/dev/ixl/ixl_txrx.c
@@ -590,10 +590,8 @@
}
if (txr->br != NULL)
buf_ring_free(txr->br, M_DEVBUF);
- if (txr->buffers != NULL) {
- free(txr->buffers, M_DEVBUF);
- txr->buffers = NULL;
- }
+ free(txr->buffers, M_DEVBUF);
+ txr->buffers = NULL;
if (txr->tx_tag != NULL) {
bus_dma_tag_destroy(txr->tx_tag);
txr->tx_tag = NULL;
@@ -1351,10 +1349,8 @@
buf->pmap = NULL;
}
}
- if (rxr->buffers != NULL) {
- free(rxr->buffers, M_DEVBUF);
- rxr->buffers = NULL;
- }
+ free(rxr->buffers, M_DEVBUF);
+ rxr->buffers = NULL;
}
if (rxr->htag != NULL) {
Index: sys/dev/kbdmux/kbdmux.c
===================================================================
--- sys/dev/kbdmux/kbdmux.c
+++ sys/dev/kbdmux/kbdmux.c
@@ -491,10 +491,8 @@
free(accmap, M_KBDMUX);
if (fkeymap != NULL)
free(fkeymap, M_KBDMUX);
- if (kbd != NULL) {
- free(kbd, M_KBDMUX);
- *kbdp = NULL; /* insure ref doesn't leak to caller */
- }
+ free(kbd, M_KBDMUX);
+ *kbdp = NULL;
}
return (error);
Index: sys/dev/malo/if_malo.c
===================================================================
--- sys/dev/malo/if_malo.c
+++ sys/dev/malo/if_malo.c
@@ -619,10 +619,8 @@
}
}
STAILQ_INIT(&sc->malo_rxbuf);
- if (sc->malo_rxdma.dd_bufptr != NULL) {
- free(sc->malo_rxdma.dd_bufptr, M_MALODEV);
- sc->malo_rxdma.dd_bufptr = NULL;
- }
+ free(sc->malo_rxdma.dd_bufptr, M_MALODEV);
+ sc->malo_rxdma.dd_bufptr = NULL;
if (sc->malo_rxdma.dd_desc_len != 0)
malo_desc_cleanup(sc, &sc->malo_rxdma);
}
@@ -653,10 +651,8 @@
}
STAILQ_INIT(&txq->free);
txq->nfree = 0;
- if (txq->dma.dd_bufptr != NULL) {
- free(txq->dma.dd_bufptr, M_MALODEV);
- txq->dma.dd_bufptr = NULL;
- }
+ free(txq->dma.dd_bufptr, M_MALODEV);
+ txq->dma.dd_bufptr = NULL;
if (txq->dma.dd_desc_len != 0)
malo_desc_cleanup(sc, &txq->dma);
}
Index: sys/dev/mca/mca_bus.c
===================================================================
--- sys/dev/mca/mca_bus.c
+++ sys/dev/mca/mca_bus.c
@@ -307,9 +307,7 @@
m_dev = NULL;
}
- if (m_dev) {
- free(m_dev, M_DEVBUF);
- }
+ free(m_dev, M_DEVBUF);
return (devices_found ? 0 : ENXIO);
}
Index: sys/dev/mfi/mfi.c
===================================================================
--- sys/dev/mfi/mfi.c
+++ sys/dev/mfi/mfi.c
@@ -1230,19 +1230,15 @@
bus_dma_tag_destroy(sc->mfi_tb_ioc_init_dmat);
if (sc->mfi_cmd_pool_tbolt != NULL) {
for (int i = 0; i < sc->mfi_max_fw_cmds; i++) {
- if (sc->mfi_cmd_pool_tbolt[i] != NULL) {
- free(sc->mfi_cmd_pool_tbolt[i],
- M_MFIBUF);
- sc->mfi_cmd_pool_tbolt[i] = NULL;
- }
+ free(sc->mfi_cmd_pool_tbolt[i],
+ M_MFIBUF);
+ sc->mfi_cmd_pool_tbolt[i] = NULL;
}
free(sc->mfi_cmd_pool_tbolt, M_MFIBUF);
sc->mfi_cmd_pool_tbolt = NULL;
}
- if (sc->request_desc_pool != NULL) {
- free(sc->request_desc_pool, M_MFIBUF);
- sc->request_desc_pool = NULL;
- }
+ free(sc->request_desc_pool, M_MFIBUF);
+ sc->request_desc_pool = NULL;
}
if (sc->mfi_buffer_dmat != NULL)
bus_dma_tag_destroy(sc->mfi_buffer_dmat);
Index: sys/dev/mpt/mpt_cam.c
===================================================================
--- sys/dev/mpt/mpt_cam.c
+++ sys/dev/mpt/mpt_cam.c
@@ -1189,10 +1189,8 @@
mpt_free_request(mpt, mpt->tmf_req);
mpt->tmf_req = NULL;
}
- if (mpt->sas_portinfo != NULL) {
- free(mpt->sas_portinfo, M_DEVBUF);
- mpt->sas_portinfo = NULL;
- }
+ free(mpt->sas_portinfo, M_DEVBUF);
+ mpt->sas_portinfo = NULL;
if (mpt->sim != NULL) {
xpt_free_path(mpt->path);
Index: sys/dev/mpt/mpt_raid.c
===================================================================
--- sys/dev/mpt/mpt_raid.c
+++ sys/dev/mpt/mpt_raid.c
@@ -1597,26 +1597,18 @@
int i;
for (i = 0; i < mpt->raid_max_volumes; i++) {
mpt_raid = &mpt->raid_volumes[i];
- if (mpt_raid->config_page) {
- free(mpt_raid->config_page, M_DEVBUF);
- mpt_raid->config_page = NULL;
- }
+ free(mpt_raid->config_page, M_DEVBUF);
+ mpt_raid->config_page = NULL;
}
free(mpt->raid_volumes, M_DEVBUF);
mpt->raid_volumes = NULL;
}
- if (mpt->raid_disks) {
- free(mpt->raid_disks, M_DEVBUF);
- mpt->raid_disks = NULL;
- }
- if (mpt->ioc_page2) {
- free(mpt->ioc_page2, M_DEVBUF);
- mpt->ioc_page2 = NULL;
- }
- if (mpt->ioc_page3) {
- free(mpt->ioc_page3, M_DEVBUF);
- mpt->ioc_page3 = NULL;
- }
+ free(mpt->raid_disks, M_DEVBUF);
+ mpt->raid_disks = NULL;
+ free(mpt->ioc_page2, M_DEVBUF);
+ mpt->ioc_page2 = NULL;
+ free(mpt->ioc_page3, M_DEVBUF);
+ mpt->ioc_page3 = NULL;
mpt->raid_max_volumes = 0;
mpt->raid_max_disks = 0;
}
Index: sys/dev/mwl/if_mwl.c
===================================================================
--- sys/dev/mwl/if_mwl.c
+++ sys/dev/mwl/if_mwl.c
@@ -2082,10 +2082,8 @@
}
STAILQ_INIT(&txq->free);
txq->nfree = 0;
- if (txq->dma.dd_bufptr != NULL) {
- free(txq->dma.dd_bufptr, M_MWLDEV);
- txq->dma.dd_bufptr = NULL;
- }
+ free(txq->dma.dd_bufptr, M_MWLDEV);
+ txq->dma.dd_bufptr = NULL;
if (txq->dma.dd_desc_len != 0)
mwl_desc_cleanup(sc, &txq->dma);
}
@@ -2206,10 +2204,8 @@
bus_dmamem_free(sc->sc_rxdmat, sc->sc_rxmem, sc->sc_rxmap);
sc->sc_rxmem = NULL;
}
- if (sc->sc_rxdma.dd_bufptr != NULL) {
- free(sc->sc_rxdma.dd_bufptr, M_MWLDEV);
- sc->sc_rxdma.dd_bufptr = NULL;
- }
+ free(sc->sc_rxdma.dd_bufptr, M_MWLDEV);
+ sc->sc_rxdma.dd_bufptr = NULL;
if (sc->sc_rxdma.dd_desc_len != 0)
mwl_desc_cleanup(sc, &sc->sc_rxdma);
}
Index: sys/dev/netmap/netmap_vale.c
===================================================================
--- sys/dev/netmap/netmap_vale.c
+++ sys/dev/netmap/netmap_vale.c
@@ -359,10 +359,8 @@
nrings = na->num_tx_rings;
kring = na->tx_rings;
for (i = 0; i < nrings; i++) {
- if (kring[i].nkr_ft) {
- free(kring[i].nkr_ft, M_DEVBUF);
- kring[i].nkr_ft = NULL; /* protect from freeing twice */
- }
+ free(kring[i].nkr_ft, M_DEVBUF);
+ kring[i].nkr_ft = NULL;
}
}
Index: sys/dev/otus/if_otus.c
===================================================================
--- sys/dev/otus/if_otus.c
+++ sys/dev/otus/if_otus.c
@@ -934,10 +934,8 @@
for (i = 0; i < ndata; i++) {
struct otus_tx_cmd *dp = &cmd[i];
- if (dp->buf != NULL) {
- free(dp->buf, M_USBDEV);
- dp->buf = NULL;
- }
+ free(dp->buf, M_USBDEV);
+ dp->buf = NULL;
}
}
@@ -1106,10 +1104,8 @@
for (i = 0; i < ndata; i++) {
struct otus_data *dp = &data[i];
- if (dp->buf != NULL) {
- free(dp->buf, M_USBDEV);
- dp->buf = NULL;
- }
+ free(dp->buf, M_USBDEV);
+ dp->buf = NULL;
if (dp->ni != NULL) {
ieee80211_free_node(dp->ni);
dp->ni = NULL;
Index: sys/dev/pci/pci.c
===================================================================
--- sys/dev/pci/pci.c
+++ sys/dev/pci/pci.c
@@ -1275,10 +1275,8 @@
if (state < -1) {
/* I/O error, clean up */
pci_printf(cfg, "failed to read VPD data.\n");
- if (cfg->vpd.vpd_ident != NULL) {
- free(cfg->vpd.vpd_ident, M_DEVBUF);
- cfg->vpd.vpd_ident = NULL;
- }
+ free(cfg->vpd.vpd_ident, M_DEVBUF);
+ cfg->vpd.vpd_ident = NULL;
if (cfg->vpd.vpd_w != NULL) {
for (off = 0; cfg->vpd.vpd_w[off].value; off++)
free(cfg->vpd.vpd_w[off].value, M_DEVBUF);
Index: sys/dev/pms/freebsd/driver/common/lxutil.c
===================================================================
--- sys/dev/pms/freebsd/driver/common/lxutil.c
+++ sys/dev/pms/freebsd/driver/common/lxutil.c
@@ -689,11 +689,9 @@
// release memory vs. alloc in agtiapi_MemAlloc; cached case
for( idx = 0; idx < pCardInfo->cacheIndex; idx++ ) {
- if( pCardInfo->tiCachedMem[idx] ) {
- free( pCardInfo->tiCachedMem[idx], M_PMC_MMAL );
- AGTIAPI_PRINTK( "agtiapi_MemFree: TI_CACHED_MEM Mem[%d] %p\n",
- idx, pCardInfo->tiCachedMem[idx] );
- }
+ free( pCardInfo->tiCachedMem[idx], M_PMC_MMAL );
+ AGTIAPI_PRINTK( "agtiapi_MemFree: TI_CACHED_MEM Mem[%d] %p\n",
+ idx, pCardInfo->tiCachedMem[idx] );
}
// release memory vs. alloc in agtiapi_typhAlloc; used in agtiapi_MemAlloc
Index: sys/dev/pms/freebsd/driver/ini/src/agtiapi.c
===================================================================
--- sys/dev/pms/freebsd/driver/ini/src/agtiapi.c
+++ sys/dev/pms/freebsd/driver/ini/src/agtiapi.c
@@ -422,10 +422,7 @@
}
pIoctlPayload->realDeviceCount = count;
AGTIAPI_PRINTK( "agtiapi_getdevlist: Exit RealDeviceCount = %d\n", count );
- if (devList)
- {
- free(devList, TEMP2);
- }
+ free(devList, TEMP2);
if(ret_val != IOCTL_CALL_FAIL)
{
ret_val = IOCTL_CALL_SUCCESS;
Index: sys/dev/ppbus/if_plip.c
===================================================================
--- sys/dev/ppbus/if_plip.c
+++ sys/dev/ppbus/if_plip.c
@@ -192,14 +192,10 @@
switch (what) {
case MOD_UNLOAD:
mtx_lock(&lp_tables_lock);
- if (txmith != NULL) {
- free(txmith, M_DEVBUF);
- txmith = NULL;
- }
- if (ctxmith != NULL) {
- free(ctxmith, M_DEVBUF);
- ctxmith = NULL;
- }
+ free(txmith, M_DEVBUF);
+ txmith = NULL;
+ free(ctxmith, M_DEVBUF);
+ ctxmith = NULL;
mtx_unlock(&lp_tables_lock);
break;
case MOD_LOAD:
Index: sys/dev/rp/rp_pci.c
===================================================================
--- sys/dev/rp/rp_pci.c
+++ sys/dev/rp/rp_pci.c
@@ -244,10 +244,8 @@
free(ctlp->io, M_DEVBUF);
ctlp->io = NULL;
}
- if (ctlp->io_rid != NULL) {
- free(ctlp->io_rid, M_DEVBUF);
- ctlp->io = NULL;
- }
+ free(ctlp->io_rid, M_DEVBUF);
+ ctlp->io = NULL;
}
static int
Index: sys/dev/sio/sio.c
===================================================================
--- sys/dev/sio/sio.c
+++ sys/dev/sio/sio.c
@@ -1919,10 +1919,8 @@
mtx_unlock_spin(&sio_lock);
splx(s);
comstart(tp);
- if (com->ibufold != NULL) {
- free(com->ibufold, M_DEVBUF);
- com->ibufold = NULL;
- }
+ free(com->ibufold, M_DEVBUF);
+ com->ibufold = NULL;
return (0);
}
Index: sys/dev/sound/pci/envy24.c
===================================================================
--- sys/dev/sound/pci/envy24.c
+++ sys/dev/sound/pci/envy24.c
@@ -1621,10 +1621,8 @@
device_printf(sc->dev, "envy24chan_free()\n");
#endif
snd_mtxlock(sc->lock);
- if (ch->data != NULL) {
- free(ch->data, M_ENVY24);
- ch->data = NULL;
- }
+ free(ch->data, M_ENVY24);
+ ch->data = NULL;
snd_mtxunlock(sc->lock);
return 0;
Index: sys/dev/sound/pci/envy24ht.c
===================================================================
--- sys/dev/sound/pci/envy24ht.c
+++ sys/dev/sound/pci/envy24ht.c
@@ -1532,10 +1532,8 @@
device_printf(sc->dev, "envy24htchan_free()\n");
#endif
snd_mtxlock(sc->lock);
- if (ch->data != NULL) {
- free(ch->data, M_ENVY24HT);
- ch->data = NULL;
- }
+ free(ch->data, M_ENVY24HT);
+ ch->data = NULL;
snd_mtxunlock(sc->lock);
return 0;
Index: sys/dev/sound/pci/hdspe-pcm.c
===================================================================
--- sys/dev/sound/pci/hdspe-pcm.c
+++ sys/dev/sound/pci/hdspe-pcm.c
@@ -413,10 +413,8 @@
device_printf(scp->dev, "hdspechan_free()\n");
#endif
snd_mtxlock(sc->lock);
- if (ch->data != NULL) {
- free(ch->data, M_HDSPE);
- ch->data = NULL;
- }
+ free(ch->data, M_HDSPE);
+ ch->data = NULL;
snd_mtxunlock(sc->lock);
return 0;
Index: sys/dev/sound/pcm/feeder_rate.c
===================================================================
--- sys/dev/sound/pcm/feeder_rate.c
+++ sys/dev/sound/pcm/feeder_rate.c
@@ -713,10 +713,8 @@
info->z_size = 1;
info->z_coeff = NULL;
info->z_dcoeff = NULL;
- if (info->z_pcoeff != NULL) {
- free(info->z_pcoeff, M_DEVBUF);
- info->z_pcoeff = NULL;
- }
+ free(info->z_pcoeff, M_DEVBUF);
+ info->z_pcoeff = NULL;
info->z_scale = Z_ONE;
info->z_dx = Z_FULL_ONE;
info->z_dy = Z_FULL_ONE;
@@ -1028,10 +1026,8 @@
int32_t alpha, c, i, z, idx;
/* Let this be here first. */
- if (info->z_pcoeff != NULL) {
- free(info->z_pcoeff, M_DEVBUF);
- info->z_pcoeff = NULL;
- }
+ free(info->z_pcoeff, M_DEVBUF);
+ info->z_pcoeff = NULL;
if (feeder_rate_polyphase_max < 1)
return (ENOTSUP);
@@ -1153,10 +1149,8 @@
* adaptive mode.
*/
z_setup_adaptive_sinc:
- if (info->z_pcoeff != NULL) {
- free(info->z_pcoeff, M_DEVBUF);
- info->z_pcoeff = NULL;
- }
+ free(info->z_pcoeff, M_DEVBUF);
+ info->z_pcoeff = NULL;
if (adaptive == 0) {
info->z_dy = z_scale << Z_DRIFT_SHIFT;
Index: sys/dev/sound/usb/uaudio.c
===================================================================
--- sys/dev/sound/usb/uaudio.c
+++ sys/dev/sound/usb/uaudio.c
@@ -2416,10 +2416,8 @@
int
uaudio_chan_free(struct uaudio_chan *ch)
{
- if (ch->buf != NULL) {
- free(ch->buf, M_DEVBUF);
- ch->buf = NULL;
- }
+ free(ch->buf, M_DEVBUF);
+ ch->buf = NULL;
usbd_transfer_unsetup(ch->xfer, UAUDIO_NCHANBUFS + 1);
ch->num_alt = 0;
Index: sys/dev/urtwn/if_urtwn.c
===================================================================
--- sys/dev/urtwn/if_urtwn.c
+++ sys/dev/urtwn/if_urtwn.c
@@ -1274,10 +1274,8 @@
for (i = 0; i < ndata; i++) {
struct urtwn_data *dp = &data[i];
- if (dp->buf != NULL) {
- free(dp->buf, M_USBDEV);
- dp->buf = NULL;
- }
+ free(dp->buf, M_USBDEV);
+ dp->buf = NULL;
if (dp->ni != NULL) {
ieee80211_free_node(dp->ni);
dp->ni = NULL;
Index: sys/dev/usb/input/ums.c
===================================================================
--- sys/dev/usb/input/ums.c
+++ sys/dev/usb/input/ums.c
@@ -664,9 +664,7 @@
return (0);
detach:
- if (d_ptr) {
- free(d_ptr, M_TEMP);
- }
+ free(d_ptr, M_TEMP);
ums_detach(dev);
return (ENOMEM);
}
Index: sys/dev/usb/serial/ucycom.c
===================================================================
--- sys/dev/usb/serial/ucycom.c
+++ sys/dev/usb/serial/ucycom.c
@@ -277,16 +277,12 @@
}
ucom_set_pnpinfo_usb(&sc->sc_super_ucom, dev);
- if (urd_ptr) {
- free(urd_ptr, M_USBDEV);
- }
+ free(urd_ptr, M_USBDEV);
return (0); /* success */
detach:
- if (urd_ptr) {
- free(urd_ptr, M_USBDEV);
- }
+ free(urd_ptr, M_USBDEV);
ucycom_detach(dev);
return (ENXIO);
}
Index: sys/dev/usb/serial/ufoma.c
===================================================================
--- sys/dev/usb/serial/ufoma.c
+++ sys/dev/usb/serial/ufoma.c
@@ -486,9 +486,7 @@
usbd_transfer_unsetup(sc->sc_ctrl_xfer, UFOMA_CTRL_ENDPT_MAX);
usbd_transfer_unsetup(sc->sc_bulk_xfer, UFOMA_BULK_ENDPT_MAX);
- if (sc->sc_modetable) {
- free(sc->sc_modetable, M_USBDEV);
- }
+ free(sc->sc_modetable, M_USBDEV);
cv_destroy(&sc->sc_cv);
device_claim_softc(dev);
Index: sys/dev/usb/usb_dev.c
===================================================================
--- sys/dev/usb/usb_dev.c
+++ sys/dev/usb/usb_dev.c
@@ -1981,11 +1981,8 @@
void
usb_fifo_free_buffer(struct usb_fifo *f)
{
- if (f->queue_data) {
- /* free old buffer */
- free(f->queue_data, M_USBDEV);
- f->queue_data = NULL;
- }
+ free(f->queue_data, M_USBDEV);
+ f->queue_data = NULL;
/* reset queues */
memset(&f->free_q, 0, sizeof(f->free_q));
Index: sys/dev/usb/usb_device.c
===================================================================
--- sys/dev/usb/usb_device.c
+++ sys/dev/usb/usb_device.c
@@ -2819,10 +2819,8 @@
if (iface == NULL)
return (USB_ERR_INVAL);
- if (iface->pnpinfo != NULL) {
- free(iface->pnpinfo, M_USBDEV);
- iface->pnpinfo = NULL;
- }
+ free(iface->pnpinfo, M_USBDEV);
+ iface->pnpinfo = NULL;
if (pnpinfo == NULL || pnpinfo[0] == 0)
return (0); /* success */
Index: sys/dev/usb/wlan/if_rsu.c
===================================================================
--- sys/dev/usb/wlan/if_rsu.c
+++ sys/dev/usb/wlan/if_rsu.c
@@ -813,10 +813,8 @@
for (i = 0; i < ndata; i++) {
struct rsu_data *dp = &data[i];
- if (dp->buf != NULL) {
- free(dp->buf, M_USBDEV);
- dp->buf = NULL;
- }
+ free(dp->buf, M_USBDEV);
+ dp->buf = NULL;
if (dp->ni != NULL) {
ieee80211_free_node(dp->ni);
dp->ni = NULL;
Index: sys/dev/virtio/balloon/virtio_balloon.c
===================================================================
--- sys/dev/virtio/balloon/virtio_balloon.c
+++ sys/dev/virtio/balloon/virtio_balloon.c
@@ -245,10 +245,8 @@
vtballoon_stop(sc);
}
- if (sc->vtballoon_page_frames != NULL) {
- free(sc->vtballoon_page_frames, M_DEVBUF);
- sc->vtballoon_page_frames = NULL;
- }
+ free(sc->vtballoon_page_frames, M_DEVBUF);
+ sc->vtballoon_page_frames = NULL;
VTBALLOON_LOCK_DESTROY(sc);
Index: sys/dev/virtio/network/if_vtnet.c
===================================================================
--- sys/dev/virtio/network/if_vtnet.c
+++ sys/dev/virtio/network/if_vtnet.c
@@ -845,15 +845,10 @@
vtnet_free_rx_filters(struct vtnet_softc *sc)
{
- if (sc->vtnet_mac_filter != NULL) {
- free(sc->vtnet_mac_filter, M_DEVBUF);
- sc->vtnet_mac_filter = NULL;
- }
-
- if (sc->vtnet_vlan_filter != NULL) {
- free(sc->vtnet_vlan_filter, M_DEVBUF);
- sc->vtnet_vlan_filter = NULL;
- }
+ free(sc->vtnet_mac_filter, M_DEVBUF);
+ sc->vtnet_mac_filter = NULL;
+ free(sc->vtnet_vlan_filter, M_DEVBUF);
+ sc->vtnet_vlan_filter = NULL;
}
static int
Index: sys/dev/vkbd/vkbd.c
===================================================================
--- sys/dev/vkbd/vkbd.c
+++ sys/dev/vkbd/vkbd.c
@@ -688,10 +688,8 @@
free(accmap, M_VKBD);
if (fkeymap != NULL)
free(fkeymap, M_VKBD);
- if (kbd != NULL) {
- free(kbd, M_VKBD);
- *kbdp = NULL; /* insure ref doesn't leak to caller */
- }
+ free(kbd, M_VKBD);
+ *kbdp = NULL;
}
return (error);
}
Index: sys/dev/vmware/vmxnet3/if_vmx.c
===================================================================
--- sys/dev/vmware/vmxnet3/if_vmx.c
+++ sys/dev/vmware/vmxnet3/if_vmx.c
@@ -1056,10 +1056,8 @@
for (i = 0; i < VMXNET3_RXRINGS_PERQ; i++) {
rxr = &rxq->vxrxq_cmd_ring[i];
- if (rxr->vxrxr_rxbuf != NULL) {
- free(rxr->vxrxr_rxbuf, M_DEVBUF);
- rxr->vxrxr_rxbuf = NULL;
- }
+ free(rxr->vxrxr_rxbuf, M_DEVBUF);
+ rxr->vxrxr_rxbuf = NULL;
}
if (mtx_initialized(&rxq->vxrxq_mtx) != 0)
@@ -1083,10 +1081,8 @@
}
#endif
- if (txr->vxtxr_txbuf != NULL) {
- free(txr->vxtxr_txbuf, M_DEVBUF);
- txr->vxtxr_txbuf = NULL;
- }
+ free(txr->vxtxr_txbuf, M_DEVBUF);
+ txr->vxtxr_txbuf = NULL;
if (mtx_initialized(&txq->vxtxq_mtx) != 0)
mtx_destroy(&txq->vxtxq_mtx);
Index: sys/dev/xen/blkback/blkback.c
===================================================================
--- sys/dev/xen/blkback/blkback.c
+++ sys/dev/xen/blkback/blkback.c
@@ -2772,10 +2772,8 @@
}
xbb->kva = 0;
xbb->gnt_base_addr = 0;
- if (xbb->kva_free != NULL) {
- free(xbb->kva_free, M_XENBLOCKBACK);
- xbb->kva_free = NULL;
- }
+ free(xbb->kva_free, M_XENBLOCKBACK);
+ xbb->kva_free = NULL;
}
/**
@@ -2826,10 +2824,8 @@
xbb_free_communication_mem(xbb);
- if (xbb->requests != NULL) {
- free(xbb->requests, M_XENBLOCKBACK);
- xbb->requests = NULL;
- }
+ free(xbb->requests, M_XENBLOCKBACK);
+ xbb->requests = NULL;
if (xbb->request_lists != NULL) {
struct xbb_xen_reqlist *reqlist;
@@ -2839,15 +2835,11 @@
for (i = 0, reqlist = xbb->request_lists;
i < xbb->max_requests; i++, reqlist++){
#ifdef XBB_USE_BOUNCE_BUFFERS
- if (reqlist->bounce != NULL) {
- free(reqlist->bounce, M_XENBLOCKBACK);
- reqlist->bounce = NULL;
- }
+ free(reqlist->bounce, M_XENBLOCKBACK);
+ reqlist->bounce = NULL;
#endif
- if (reqlist->gnt_handles != NULL) {
- free(reqlist->gnt_handles, M_XENBLOCKBACK);
- reqlist->gnt_handles = NULL;
- }
+ free(reqlist->gnt_handles, M_XENBLOCKBACK);
+ reqlist->gnt_handles = NULL;
}
free(xbb->request_lists, M_XENBLOCKBACK);
xbb->request_lists = NULL;
@@ -3771,20 +3763,12 @@
xbb_close_backend(xbb);
- if (xbb->dev_mode != NULL) {
- free(xbb->dev_mode, M_XENSTORE);
- xbb->dev_mode = NULL;
- }
-
- if (xbb->dev_type != NULL) {
- free(xbb->dev_type, M_XENSTORE);
- xbb->dev_type = NULL;
- }
-
- if (xbb->dev_name != NULL) {
- free(xbb->dev_name, M_XENSTORE);
- xbb->dev_name = NULL;
- }
+ free(xbb->dev_mode, M_XENSTORE);
+ xbb->dev_mode = NULL;
+ free(xbb->dev_type, M_XENSTORE);
+ xbb->dev_type = NULL;
+ free(xbb->dev_name, M_XENSTORE);
+ xbb->dev_name = NULL;
mtx_destroy(&xbb->lock);
return (0);
Index: sys/dev/xen/blkfront/blkfront.c
===================================================================
--- sys/dev/xen/blkfront/blkfront.c
+++ sys/dev/xen/blkfront/blkfront.c
@@ -1062,10 +1062,8 @@
struct xbd_command *cm;
cm = &sc->xbd_shadow[i];
- if (cm->cm_sg_refs != NULL) {
- free(cm->cm_sg_refs, M_XENBLOCKFRONT);
- cm->cm_sg_refs = NULL;
- }
+ free(cm->cm_sg_refs, M_XENBLOCKFRONT);
+ cm->cm_sg_refs = NULL;
if (cm->cm_indirectionpages != NULL) {
gnttab_end_foreign_access_references(
Index: sys/dev/xen/grant_table/grant_table.c
===================================================================
--- sys/dev/xen/grant_table/grant_table.c
+++ sys/dev/xen/grant_table/grant_table.c
@@ -201,9 +201,7 @@
{
if (gnttab_end_foreign_access_ref(ref)) {
put_free_entry(ref);
- if (page != NULL) {
- free(page, M_DEVBUF);
- }
+ free(page, M_DEVBUF);
}
else {
/* XXX This needs to be fixed so that the ref and page are
Index: sys/dev/xen/netback/netback.c
===================================================================
--- sys/dev/xen/netback/netback.c
+++ sys/dev/xen/netback/netback.c
@@ -661,10 +661,8 @@
mtx_unlock(&xnb->rx_lock);
/* Free malloc'd softc member variables */
- if (xnb->bridge != NULL) {
- free(xnb->bridge, M_XENSTORE);
- xnb->bridge = NULL;
- }
+ free(xnb->bridge, M_XENSTORE);
+ xnb->bridge = NULL;
/* All request processing has stopped, so unmap the rings */
for (i=0; i < XNB_NUM_RING_TYPES; i++) {
Index: sys/dev/xen/netback/netback_unit_tests.c
===================================================================
--- sys/dev/xen/netback/netback_unit_tests.c
+++ sys/dev/xen/netback/netback_unit_tests.c
@@ -374,12 +374,8 @@
static void
teardown_pvt_data(void)
{
- if (xnb_unit_pvt.txs != NULL) {
- free(xnb_unit_pvt.txs, M_XENNETBACK);
- }
- if (xnb_unit_pvt.rxs != NULL) {
- free(xnb_unit_pvt.rxs, M_XENNETBACK);
- }
+ free(xnb_unit_pvt.txs, M_XENNETBACK);
+ free(xnb_unit_pvt.rxs, M_XENNETBACK);
if (xnb_unit_pvt.ifp != NULL) {
if_free(xnb_unit_pvt.ifp);
}
Index: sys/fs/cd9660/cd9660_vfsops.c
===================================================================
--- sys/fs/cd9660/cd9660_vfsops.c
+++ sys/fs/cd9660/cd9660_vfsops.c
@@ -487,10 +487,8 @@
g_topology_unlock();
PICKUP_GIANT();
}
- if (isomp) {
- free(isomp, M_ISOFSMNT);
- mp->mnt_data = NULL;
- }
+ free(isomp, M_ISOFSMNT);
+ mp->mnt_data = NULL;
dev_rel(dev);
return error;
}
Index: sys/fs/devfs/devfs_devs.c
===================================================================
--- sys/fs/devfs/devfs_devs.c
+++ sys/fs/devfs/devfs_devs.c
@@ -401,10 +401,8 @@
sx_xlock(&dm->dm_lock);
} else
mtx_unlock(&devfs_de_interlock);
- if (de->de_symlink) {
- free(de->de_symlink, M_DEVFS);
- de->de_symlink = NULL;
- }
+ free(de->de_symlink, M_DEVFS);
+ de->de_symlink = NULL;
#ifdef MAC
mac_devfs_destroy(de);
#endif
Index: sys/fs/nandfs/nandfs_vfsops.c
===================================================================
--- sys/fs/nandfs/nandfs_vfsops.c
+++ sys/fs/nandfs/nandfs_vfsops.c
@@ -1429,10 +1429,8 @@
if (args != NULL)
free(args, M_NANDFSMNT);
- if (nmp != NULL) {
- free(nmp, M_NANDFSMNT);
- mp->mnt_data = NULL;
- }
+ free(nmp, M_NANDFSMNT);
+ mp->mnt_data = NULL;
unmounted:
return (error);
}
Index: sys/fs/nfsclient/nfs_clstate.c
===================================================================
--- sys/fs/nfsclient/nfs_clstate.c
+++ sys/fs/nfsclient/nfs_clstate.c
@@ -3439,10 +3439,8 @@
NFSUNLOCKCLSTATE();
} else
error = NFSERR_NOMATCHLAYOUT;
- if (recallp != NULL) {
- free(recallp, M_NFSLAYRECALL);
- recallp = NULL;
- }
+ free(recallp, M_NFSLAYRECALL);
+ recallp = NULL;
break;
case NFSV4OP_CBSEQUENCE:
NFSM_DISSECT(tl, uint32_t *, NFSX_V4SESSIONID +
Index: sys/fs/unionfs/union_subr.c
===================================================================
--- sys/fs/unionfs/union_subr.c
+++ sys/fs/unionfs/union_subr.c
@@ -367,10 +367,8 @@
vrele(dvp);
unp->un_dvp = NULLVP;
}
- if (unp->un_path != NULL) {
- free(unp->un_path, M_UNIONFSPATH);
- unp->un_path = NULL;
- }
+ free(unp->un_path, M_UNIONFSPATH);
+ unp->un_path = NULL;
if (unp->un_hashtbl != NULL) {
for (count = 0; count <= unp->un_hashmask; count++) {
Index: sys/geom/eli/g_eli.c
===================================================================
--- sys/geom/eli/g_eli.c
+++ sys/geom/eli/g_eli.c
@@ -209,10 +209,8 @@
G_ELI_LOGREQ(0, pbp, "%s() failed (error=%d)", __func__,
pbp->bio_error);
pbp->bio_completed = 0;
- if (pbp->bio_driver2 != NULL) {
- free(pbp->bio_driver2, M_ELI);
- pbp->bio_driver2 = NULL;
- }
+ free(pbp->bio_driver2, M_ELI);
+ pbp->bio_driver2 = NULL;
g_io_deliver(pbp, pbp->bio_error);
atomic_subtract_int(&sc->sc_inflight, 1);
return;
Index: sys/geom/raid/md_ddf.c
===================================================================
--- sys/geom/raid/md_ddf.c
+++ sys/geom/raid/md_ddf.c
@@ -808,34 +808,20 @@
ddf_meta_free(struct ddf_meta *meta)
{
- if (meta->hdr != NULL) {
- free(meta->hdr, M_MD_DDF);
- meta->hdr = NULL;
- }
- if (meta->cdr != NULL) {
- free(meta->cdr, M_MD_DDF);
- meta->cdr = NULL;
- }
- if (meta->pdr != NULL) {
- free(meta->pdr, M_MD_DDF);
- meta->pdr = NULL;
- }
- if (meta->vdr != NULL) {
- free(meta->vdr, M_MD_DDF);
- meta->vdr = NULL;
- }
- if (meta->cr != NULL) {
- free(meta->cr, M_MD_DDF);
- meta->cr = NULL;
- }
- if (meta->pdd != NULL) {
- free(meta->pdd, M_MD_DDF);
- meta->pdd = NULL;
- }
- if (meta->bbm != NULL) {
- free(meta->bbm, M_MD_DDF);
- meta->bbm = NULL;
- }
+ free(meta->hdr, M_MD_DDF);
+ meta->hdr = NULL;
+ free(meta->cdr, M_MD_DDF);
+ meta->cdr = NULL;
+ free(meta->pdr, M_MD_DDF);
+ meta->pdr = NULL;
+ free(meta->vdr, M_MD_DDF);
+ meta->vdr = NULL;
+ free(meta->cr, M_MD_DDF);
+ meta->cr = NULL;
+ free(meta->pdd, M_MD_DDF);
+ meta->pdd = NULL;
+ free(meta->bbm, M_MD_DDF);
+ meta->bbm = NULL;
}
static void
@@ -934,27 +920,17 @@
{
int i;
- if (meta->hdr != NULL) {
- free(meta->hdr, M_MD_DDF);
- meta->hdr = NULL;
- }
- if (meta->cdr != NULL) {
- free(meta->cdr, M_MD_DDF);
- meta->cdr = NULL;
- }
- if (meta->vde != NULL) {
- free(meta->vde, M_MD_DDF);
- meta->vde = NULL;
- }
- if (meta->vdc != NULL) {
- free(meta->vdc, M_MD_DDF);
- meta->vdc = NULL;
- }
+ free(meta->hdr, M_MD_DDF);
+ meta->hdr = NULL;
+ free(meta->cdr, M_MD_DDF);
+ meta->cdr = NULL;
+ free(meta->vde, M_MD_DDF);
+ meta->vde = NULL;
+ free(meta->vdc, M_MD_DDF);
+ meta->vdc = NULL;
for (i = 0; i < DDF_MAX_DISKS_HARD; i++) {
- if (meta->bvdc[i] != NULL) {
- free(meta->bvdc[i], M_MD_DDF);
- meta->bvdc[i] = NULL;
- }
+ free(meta->bvdc[i], M_MD_DDF);
+ meta->bvdc[i] = NULL;
}
}
Index: sys/geom/raid/md_intel.c
===================================================================
--- sys/geom/raid/md_intel.c
+++ sys/geom/raid/md_intel.c
@@ -2669,10 +2669,8 @@
struct g_raid_md_intel_perdisk *pd;
pd = (struct g_raid_md_intel_perdisk *)disk->d_md_data;
- if (pd->pd_meta != NULL) {
- free(pd->pd_meta, M_MD_INTEL);
- pd->pd_meta = NULL;
- }
+ free(pd->pd_meta, M_MD_INTEL);
+ pd->pd_meta = NULL;
free(pd, M_MD_INTEL);
disk->d_md_data = NULL;
return (0);
@@ -2704,10 +2702,8 @@
root_mount_rel(mdi->mdio_rootmount);
mdi->mdio_rootmount = NULL;
}
- if (mdi->mdio_meta != NULL) {
- free(mdi->mdio_meta, M_MD_INTEL);
- mdi->mdio_meta = NULL;
- }
+ free(mdi->mdio_meta, M_MD_INTEL);
+ mdi->mdio_meta = NULL;
return (0);
}
Index: sys/geom/raid/md_jmicron.c
===================================================================
--- sys/geom/raid/md_jmicron.c
+++ sys/geom/raid/md_jmicron.c
@@ -1458,10 +1458,8 @@
if (disk->d_state != G_RAID_DISK_S_ACTIVE &&
disk->d_state != G_RAID_DISK_S_SPARE)
continue;
- if (pd->pd_meta != NULL) {
- free(pd->pd_meta, M_MD_JMICRON);
- pd->pd_meta = NULL;
- }
+ free(pd->pd_meta, M_MD_JMICRON);
+ pd->pd_meta = NULL;
pd->pd_meta = jmicron_meta_copy(meta);
pd->pd_meta->disk_id = pd->pd_disk_id;
if ((sd = TAILQ_FIRST(&disk->d_subdisks)) != NULL) {
@@ -1530,10 +1528,8 @@
struct g_raid_md_jmicron_perdisk *pd;
pd = (struct g_raid_md_jmicron_perdisk *)disk->d_md_data;
- if (pd->pd_meta != NULL) {
- free(pd->pd_meta, M_MD_JMICRON);
- pd->pd_meta = NULL;
- }
+ free(pd->pd_meta, M_MD_JMICRON);
+ pd->pd_meta = NULL;
free(pd, M_MD_JMICRON);
disk->d_md_data = NULL;
return (0);
@@ -1553,10 +1549,8 @@
root_mount_rel(mdi->mdio_rootmount);
mdi->mdio_rootmount = NULL;
}
- if (mdi->mdio_meta != NULL) {
- free(mdi->mdio_meta, M_MD_JMICRON);
- mdi->mdio_meta = NULL;
- }
+ free(mdi->mdio_meta, M_MD_JMICRON);
+ mdi->mdio_meta = NULL;
return (0);
}
Index: sys/geom/raid/md_nvidia.c
===================================================================
--- sys/geom/raid/md_nvidia.c
+++ sys/geom/raid/md_nvidia.c
@@ -1478,10 +1478,8 @@
if (disk->d_state != G_RAID_DISK_S_ACTIVE &&
disk->d_state != G_RAID_DISK_S_SPARE)
continue;
- if (pd->pd_meta != NULL) {
- free(pd->pd_meta, M_MD_NVIDIA);
- pd->pd_meta = NULL;
- }
+ free(pd->pd_meta, M_MD_NVIDIA);
+ pd->pd_meta = NULL;
pd->pd_meta = nvidia_meta_copy(meta);
if ((sd = TAILQ_FIRST(&disk->d_subdisks)) != NULL) {
/* For RAID0+1 we need to translate order. */
@@ -1550,10 +1548,8 @@
struct g_raid_md_nvidia_perdisk *pd;
pd = (struct g_raid_md_nvidia_perdisk *)disk->d_md_data;
- if (pd->pd_meta != NULL) {
- free(pd->pd_meta, M_MD_NVIDIA);
- pd->pd_meta = NULL;
- }
+ free(pd->pd_meta, M_MD_NVIDIA);
+ pd->pd_meta = NULL;
free(pd, M_MD_NVIDIA);
disk->d_md_data = NULL;
return (0);
@@ -1573,10 +1569,8 @@
root_mount_rel(mdi->mdio_rootmount);
mdi->mdio_rootmount = NULL;
}
- if (mdi->mdio_meta != NULL) {
- free(mdi->mdio_meta, M_MD_NVIDIA);
- mdi->mdio_meta = NULL;
- }
+ free(mdi->mdio_meta, M_MD_NVIDIA);
+ mdi->mdio_meta = NULL;
return (0);
}
Index: sys/geom/raid/md_promise.c
===================================================================
--- sys/geom/raid/md_promise.c
+++ sys/geom/raid/md_promise.c
@@ -1961,10 +1961,8 @@
pd = (struct g_raid_md_promise_perdisk *)disk->d_md_data;
for (i = 0; i < pd->pd_subdisks; i++) {
- if (pd->pd_meta[i] != NULL) {
- free(pd->pd_meta[i], M_MD_PROMISE);
- pd->pd_meta[i] = NULL;
- }
+ free(pd->pd_meta[i], M_MD_PROMISE);
+ pd->pd_meta[i] = NULL;
}
free(pd, M_MD_PROMISE);
disk->d_md_data = NULL;
Index: sys/geom/raid/md_sii.c
===================================================================
--- sys/geom/raid/md_sii.c
+++ sys/geom/raid/md_sii.c
@@ -1547,10 +1547,8 @@
pd = (struct g_raid_md_sii_perdisk *)disk->d_md_data;
if (disk->d_state != G_RAID_DISK_S_ACTIVE)
continue;
- if (pd->pd_meta != NULL) {
- free(pd->pd_meta, M_MD_SII);
- pd->pd_meta = NULL;
- }
+ free(pd->pd_meta, M_MD_SII);
+ pd->pd_meta = NULL;
pd->pd_meta = sii_meta_copy(meta);
if ((sd = TAILQ_FIRST(&disk->d_subdisks)) != NULL) {
if (sd->sd_state < G_RAID_SUBDISK_S_NEW)
@@ -1638,10 +1636,8 @@
struct g_raid_md_sii_perdisk *pd;
pd = (struct g_raid_md_sii_perdisk *)disk->d_md_data;
- if (pd->pd_meta != NULL) {
- free(pd->pd_meta, M_MD_SII);
- pd->pd_meta = NULL;
- }
+ free(pd->pd_meta, M_MD_SII);
+ pd->pd_meta = NULL;
free(pd, M_MD_SII);
disk->d_md_data = NULL;
return (0);
@@ -1661,10 +1657,8 @@
root_mount_rel(mdi->mdio_rootmount);
mdi->mdio_rootmount = NULL;
}
- if (mdi->mdio_meta != NULL) {
- free(mdi->mdio_meta, M_MD_SII);
- mdi->mdio_meta = NULL;
- }
+ free(mdi->mdio_meta, M_MD_SII);
+ mdi->mdio_meta = NULL;
return (0);
}
Index: sys/geom/raid/tr_raid1.c
===================================================================
--- sys/geom/raid/tr_raid1.c
+++ sys/geom/raid/tr_raid1.c
@@ -974,10 +974,8 @@
trs = (struct g_raid_tr_raid1_object *)tr;
- if (trs->trso_buffer != NULL) {
- free(trs->trso_buffer, M_TR_RAID1);
- trs->trso_buffer = NULL;
- }
+ free(trs->trso_buffer, M_TR_RAID1);
+ trs->trso_buffer = NULL;
return (0);
}
Index: sys/geom/raid/tr_raid1e.c
===================================================================
--- sys/geom/raid/tr_raid1e.c
+++ sys/geom/raid/tr_raid1e.c
@@ -1232,10 +1232,8 @@
trs = (struct g_raid_tr_raid1e_object *)tr;
- if (trs->trso_buffer != NULL) {
- free(trs->trso_buffer, M_TR_RAID1E);
- trs->trso_buffer = NULL;
- }
+ free(trs->trso_buffer, M_TR_RAID1E);
+ trs->trso_buffer = NULL;
return (0);
}
Index: sys/geom/raid/tr_raid5.c
===================================================================
--- sys/geom/raid/tr_raid5.c
+++ sys/geom/raid/tr_raid5.c
@@ -411,10 +411,8 @@
trs = (struct g_raid_tr_raid5_object *)tr;
- if (trs->trso_buffer != NULL) {
- free(trs->trso_buffer, M_TR_RAID5);
- trs->trso_buffer = NULL;
- }
+ free(trs->trso_buffer, M_TR_RAID5);
+ trs->trso_buffer = NULL;
return (0);
}
Index: sys/gnu/fs/reiserfs/reiserfs_vfsops.c
===================================================================
--- sys/gnu/fs/reiserfs/reiserfs_vfsops.c
+++ sys/gnu/fs/reiserfs/reiserfs_vfsops.c
@@ -201,11 +201,9 @@
"release bitmap buffers (total: %d)\n",
SB_BMAP_NR(sbi));
for (i = 0; i < SB_BMAP_NR(sbi); i++) {
- if (SB_AP_BITMAP(sbi)[i].bp_data) {
- free(SB_AP_BITMAP(sbi)[i].bp_data,
- M_REISERFSMNT);
- SB_AP_BITMAP(sbi)[i].bp_data = NULL;
- }
+ free(SB_AP_BITMAP(sbi)[i].bp_data,
+ M_REISERFSMNT);
+ SB_AP_BITMAP(sbi)[i].bp_data = NULL;
}
reiserfs_log(LOG_DEBUG, "free bitmaps structure\n");
@@ -601,10 +599,8 @@
free(SB_AP_BITMAP(sbi), M_REISERFSMNT);
}
- if (sbi->s_rs) {
- free(sbi->s_rs, M_REISERFSMNT);
- sbi->s_rs = NULL;
- }
+ free(sbi->s_rs, M_REISERFSMNT);
+ sbi->s_rs = NULL;
}
if (cp != NULL) {
Index: sys/i386/ibcs2/ibcs2_misc.c
===================================================================
--- sys/i386/ibcs2/ibcs2_misc.c
+++ sys/i386/ibcs2/ibcs2_misc.c
@@ -372,10 +372,8 @@
auio.uio_resid = buflen;
auio.uio_offset = off;
- if (cookies) {
- free(cookies, M_TEMP);
- cookies = NULL;
- }
+ free(cookies, M_TEMP);
+ cookies = NULL;
#ifdef MAC
error = mac_vnode_check_readdir(td->td_ucred, vp);
@@ -533,10 +531,8 @@
auio.uio_resid = buflen;
auio.uio_offset = off;
- if (cookies) {
- free(cookies, M_TEMP);
- cookies = NULL;
- }
+ free(cookies, M_TEMP);
+ cookies = NULL;
#ifdef MAC
error = mac_vnode_check_readdir(td->td_ucred, vp);
Index: sys/kern/kern_dtrace.c
===================================================================
--- sys/kern/kern_dtrace.c
+++ sys/kern/kern_dtrace.c
@@ -75,10 +75,8 @@
kdtrace_proc_dtor(void *arg __unused, struct proc *p)
{
- if (p->p_dtrace != NULL) {
- free(p->p_dtrace, M_KDTRACE);
- p->p_dtrace = NULL;
- }
+ free(p->p_dtrace, M_KDTRACE);
+ p->p_dtrace = NULL;
}
/* Return the DTrace thread data size compiled in the kernel hooks. */
@@ -100,10 +98,8 @@
kdtrace_thread_dtor(void *arg __unused, struct thread *td)
{
- if (td->td_dtrace != NULL) {
- free(td->td_dtrace, M_KDTRACE);
- td->td_dtrace = NULL;
- }
+ free(td->td_dtrace, M_KDTRACE);
+ td->td_dtrace = NULL;
}
/*
Index: sys/kern/kern_exec.c
===================================================================
--- sys/kern/kern_exec.c
+++ sys/kern/kern_exec.c
@@ -1318,10 +1318,8 @@
PATH_MAX + ARG_MAX);
args->buf = NULL;
}
- if (args->fname_buf != NULL) {
- free(args->fname_buf, M_TEMP);
- args->fname_buf = NULL;
- }
+ free(args->fname_buf, M_TEMP);
+ args->fname_buf = NULL;
if (args->fdp != NULL)
fdescfree_remapped(args->fdp);
}
Index: sys/kern/kern_jail.c
===================================================================
--- sys/kern/kern_jail.c
+++ sys/kern/kern_jail.c
@@ -2753,9 +2753,10 @@
if (pr->pr_ip4s > 0)
bcopy(ppr->pr_ip4, pr->pr_ip4,
pr->pr_ip4s * sizeof(*newip4));
- else if (pr->pr_ip4 != NULL) {
+ else {
free(pr->pr_ip4, M_PRISON);
pr->pr_ip4 = NULL;
+
}
} else if (pr->pr_ip4s > 0) {
/* Remove addresses that aren't in the parent. */
@@ -3091,9 +3092,10 @@
if (pr->pr_ip6s > 0)
bcopy(ppr->pr_ip6, pr->pr_ip6,
pr->pr_ip6s * sizeof(*newip6));
- else if (pr->pr_ip6 != NULL) {
+ else {
free(pr->pr_ip6, M_PRISON);
pr->pr_ip6 = NULL;
+
}
} else if (pr->pr_ip6s > 0) {
/* Remove addresses that aren't in the parent. */
Index: sys/kern/kern_linker.c
===================================================================
--- sys/kern/kern_linker.c
+++ sys/kern/kern_linker.c
@@ -708,14 +708,10 @@
EVENTHANDLER_INVOKE(kld_unload, file->filename, file->address,
file->size);
- if (file->filename) {
- free(file->filename, M_LINKER);
- file->filename = NULL;
- }
- if (file->pathname) {
- free(file->pathname, M_LINKER);
- file->pathname = NULL;
- }
+ free(file->filename, M_LINKER);
+ file->filename = NULL;
+ free(file->pathname, M_LINKER);
+ file->pathname = NULL;
kobj_delete((kobj_t) file, M_LINKER);
return (0);
}
Index: sys/kern/kern_proc.c
===================================================================
--- sys/kern/kern_proc.c
+++ sys/kern/kern_proc.c
@@ -2538,10 +2538,8 @@
PROC_LOCK(p);
repeat:
if (numthreads < p->p_numthreads) {
- if (lwpidarray != NULL) {
- free(lwpidarray, M_TEMP);
- lwpidarray = NULL;
- }
+ free(lwpidarray, M_TEMP);
+ lwpidarray = NULL;
numthreads = p->p_numthreads;
PROC_UNLOCK(p);
lwpidarray = malloc(sizeof(*lwpidarray) * numthreads, M_TEMP,
Index: sys/kern/vfs_export.c
===================================================================
--- sys/kern/vfs_export.c
+++ sys/kern/vfs_export.c
@@ -374,10 +374,8 @@
if (mp == NULL) {
if (nfs_pub.np_valid) {
nfs_pub.np_valid = 0;
- if (nfs_pub.np_index != NULL) {
- free(nfs_pub.np_index, M_TEMP);
- nfs_pub.np_index = NULL;
- }
+ free(nfs_pub.np_index, M_TEMP);
+ nfs_pub.np_index = NULL;
}
return (0);
}
Index: sys/kgssapi/gss_release_buffer.c
===================================================================
--- sys/kgssapi/gss_release_buffer.c
+++ sys/kgssapi/gss_release_buffer.c
@@ -41,9 +41,7 @@
{
*minor_status = 0;
- if (buffer->value) {
- free(buffer->value, M_GSSAPI);
- }
+ free(buffer->value, M_GSSAPI);
buffer->length = 0;
buffer->value = NULL;
Index: sys/kgssapi/krb5/krb5_mech.c
===================================================================
--- sys/kgssapi/krb5/krb5_mech.c
+++ sys/kgssapi/krb5/krb5_mech.c
@@ -170,11 +170,9 @@
static void
delete_data(struct krb5_data *dp)
{
- if (dp->kd_data) {
- free(dp->kd_data, M_GSSAPI);
- dp->kd_length = 0;
- dp->kd_data = NULL;
- }
+ free(dp->kd_data, M_GSSAPI);
+ dp->kd_length = 0;
+ dp->kd_data = NULL;
}
static void
Index: sys/net/altq/altq_hfsc.c
===================================================================
--- sys/net/altq/altq_hfsc.c
+++ sys/net/altq/altq_hfsc.c
@@ -1835,11 +1835,9 @@
if (usc != NULL) {
if (usc->m1 == 0 && usc->m2 == 0) {
- if (cl->cl_usc != NULL) {
- free(cl->cl_usc, M_DEVBUF);
- cl->cl_usc = NULL;
- cl->cl_myf = 0;
- }
+ free(cl->cl_usc, M_DEVBUF);
+ cl->cl_usc = NULL;
+ cl->cl_myf = 0;
} else {
if (cl->cl_usc == NULL)
cl->cl_usc = usc_tmp;
Index: sys/net/if_vxlan.c
===================================================================
--- sys/net/if_vxlan.c
+++ sys/net/if_vxlan.c
@@ -1384,15 +1384,10 @@
sc->vxl_mc_ifindex = 0;
}
- if (sc->vxl_im4o != NULL) {
- free(sc->vxl_im4o, M_VXLAN);
- sc->vxl_im4o = NULL;
- }
-
- if (sc->vxl_im6o != NULL) {
- free(sc->vxl_im6o, M_VXLAN);
- sc->vxl_im6o = NULL;
- }
+ free(sc->vxl_im4o, M_VXLAN);
+ sc->vxl_im4o = NULL;
+ free(sc->vxl_im6o, M_VXLAN);
+ sc->vxl_im6o = NULL;
}
static int
Index: sys/netgraph/ng_mppc.c
===================================================================
--- sys/netgraph/ng_mppc.c
+++ sys/netgraph/ng_mppc.c
@@ -304,10 +304,8 @@
#ifdef NETGRAPH_MPPC_COMPRESSION
/* Initialize state buffers for compression */
- if (d->history != NULL) {
- free(d->history, M_NETGRAPH_MPPC);
- d->history = NULL;
- }
+ free(d->history, M_NETGRAPH_MPPC);
+ d->history = NULL;
if ((cfg->bits & MPPC_BIT) != 0) {
d->history = malloc(isComp ?
MPPC_SizeOfCompressionHistory() :
Index: sys/netgraph/ng_pipe.c
===================================================================
--- sys/netgraph/ng_pipe.c
+++ sys/netgraph/ng_pipe.c
@@ -459,10 +459,8 @@
if (new->ber == -1) {
current->ber = 0;
- if (hinfo->ber_p) {
- free(hinfo->ber_p, M_NG_PIPE);
- hinfo->ber_p = NULL;
- }
+ free(hinfo->ber_p, M_NG_PIPE);
+ hinfo->ber_p = NULL;
} else if (new->ber >= 1 && new->ber <= 1000000000000) {
static const uint64_t one = 0x1000000000000; /* = 2^48 */
uint64_t p0, p;
Index: sys/netinet/ip_id.c
===================================================================
--- sys/netinet/ip_id.c
+++ sys/netinet/ip_id.c
@@ -198,10 +198,8 @@
new_bits = malloc(bitstr_size(65536), M_IPID, M_WAITOK | M_ZERO);
mtx_lock(&V_ip_id_mtx);
- if (V_id_array != NULL) {
- free(V_id_array, M_IPID);
- free(V_id_bits, M_IPID);
- }
+ free(V_id_array, M_IPID);
+ free(V_id_bits, M_IPID);
V_id_array = new_array;
V_id_bits = new_bits;
V_array_size = new_size;
@@ -288,10 +286,8 @@
{
mtx_destroy(&V_ip_id_mtx);
- if (V_id_array != NULL) {
- free(V_id_array, M_IPID);
- free(V_id_bits, M_IPID);
- }
+ free(V_id_array, M_IPID);
+ free(V_id_bits, M_IPID);
counter_u64_free(V_ip_id);
}
VNET_SYSUNINIT(ip_id, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, ipid_sysuninit, NULL);
Index: sys/netipsec/key.c
===================================================================
--- sys/netipsec/key.c
+++ sys/netipsec/key.c
@@ -2879,22 +2879,14 @@
free(sav->sched, M_IPSEC_MISC);
sav->sched = NULL;
}
- if (sav->replay != NULL) {
- free(sav->replay, M_IPSEC_MISC);
- sav->replay = NULL;
- }
- if (sav->lft_c != NULL) {
- free(sav->lft_c, M_IPSEC_MISC);
- sav->lft_c = NULL;
- }
- if (sav->lft_h != NULL) {
- free(sav->lft_h, M_IPSEC_MISC);
- sav->lft_h = NULL;
- }
- if (sav->lft_s != NULL) {
- free(sav->lft_s, M_IPSEC_MISC);
- sav->lft_s = NULL;
- }
+ free(sav->replay, M_IPSEC_MISC);
+ sav->replay = NULL;
+ free(sav->lft_c, M_IPSEC_MISC);
+ sav->lft_c = NULL;
+ free(sav->lft_h, M_IPSEC_MISC);
+ sav->lft_h = NULL;
+ free(sav->lft_s, M_IPSEC_MISC);
+ sav->lft_s = NULL;
}
/*
Index: sys/netpfil/ipfw/ip_dummynet.c
===================================================================
--- sys/netpfil/ipfw/ip_dummynet.c
+++ sys/netpfil/ipfw/ip_dummynet.c
@@ -765,10 +765,8 @@
dn_ht_free(s->siht, 0);
} else if (s->siht)
si_destroy(s->siht, NULL);
- if (s->profile) {
- free(s->profile, M_DUMMYNET);
- s->profile = NULL;
- }
+ free(s->profile, M_DUMMYNET);
+ s->profile = NULL;
s->siht = NULL;
if (s->fp->destroy)
s->fp->destroy(s);
@@ -1086,10 +1084,8 @@
}
/* If the lookup table already exist, free and create it again. */
- if (fs->w_q_lookup) {
- free(fs->w_q_lookup, M_DUMMYNET);
- fs->w_q_lookup = NULL;
- }
+ free(fs->w_q_lookup, M_DUMMYNET);
+ fs->w_q_lookup = NULL;
if (dn_cfg.red_lookup_depth == 0) {
printf("\ndummynet: net.inet.ip.dummynet.red_lookup_depth"
"must be > 0\n");
@@ -1249,10 +1245,8 @@
return EINVAL;
}
/* remove profile if exists */
- if (s->profile) {
- free(s->profile, M_DUMMYNET);
- s->profile = NULL;
- }
+ free(s->profile, M_DUMMYNET);
+ s->profile = NULL;
/* copy all parameters */
s->link.oid = p->oid;
s->link.link_nr = i;
Index: sys/netpfil/ipfw/ip_fw_table.c
===================================================================
--- sys/netpfil/ipfw/ip_fw_table.c
+++ sys/netpfil/ipfw/ip_fw_table.c
@@ -463,10 +463,8 @@
for (i = 0; i < count; i++, v += ta_buf_sz) {
ptei = &tei[i];
ta->flush_entry(ch, ptei, v);
- if (ptei->ptv != NULL) {
- free(ptei->ptv, M_IPFW);
- ptei->ptv = NULL;
- }
+ free(ptei->ptv, M_IPFW);
+ ptei->ptv = NULL;
}
/* Clean up "deleted" state in case of rollback */
Index: sys/netsmb/smb_crypt.c
===================================================================
--- sys/netsmb/smb_crypt.c
+++ sys/netsmb/smb_crypt.c
@@ -153,12 +153,10 @@
KASSERT(vcp->vc_hflags2 & SMB_FLAGS2_SECURITY_SIGNATURE,
("signatures not enabled"));
- if (vcp->vc_mackey != NULL) {
- free(vcp->vc_mackey, M_SMBTEMP);
- vcp->vc_mackey = NULL;
- vcp->vc_mackeylen = 0;
- vcp->vc_seqno = 0;
- }
+ free(vcp->vc_mackey, M_SMBTEMP);
+ vcp->vc_mackey = NULL;
+ vcp->vc_mackeylen = 0;
+ vcp->vc_seqno = 0;
/*
* The partial MAC key is the concatenation of the 16 byte session
Index: sys/netsmb/smb_trantcp.c
===================================================================
--- sys/netsmb/smb_trantcp.c
+++ sys/netsmb/smb_trantcp.c
@@ -530,10 +530,8 @@
slen = sap->sa_len;
if (slen < NB_MINSALEN)
return EINVAL;
- if (nbp->nbp_paddr) {
- free(nbp->nbp_paddr, M_SONAME);
- nbp->nbp_paddr = NULL;
- }
+ free(nbp->nbp_paddr, M_SONAME);
+ nbp->nbp_paddr = NULL;
snb = (struct sockaddr_nb*)sodupsockaddr(sap, M_WAITOK);
if (snb == NULL)
return ENOMEM;
Index: sys/nfs/krpc_subr.c
===================================================================
--- sys/nfs/krpc_subr.c
+++ sys/nfs/krpc_subr.c
@@ -336,10 +336,8 @@
*/
secs = timo;
while (secs > 0) {
- if (from) {
- free(from, M_SONAME);
- from = NULL;
- }
+ free(from, M_SONAME);
+ from = NULL;
if (m) {
m_freem(m);
m = NULL;
Index: sys/pc98/cbus/sio.c
===================================================================
--- sys/pc98/cbus/sio.c
+++ sys/pc98/cbus/sio.c
@@ -2941,10 +2941,8 @@
mtx_unlock_spin(&sio_lock);
splx(s);
comstart(tp);
- if (com->ibufold != NULL) {
- free(com->ibufold, M_DEVBUF);
- com->ibufold = NULL;
- }
+ free(com->ibufold, M_DEVBUF);
+ com->ibufold = NULL;
return (0);
}
Index: sys/rpc/svc.c
===================================================================
--- sys/rpc/svc.c
+++ sys/rpc/svc.c
@@ -634,10 +634,8 @@
return (FALSE);
ok = SVC_REPLY(xprt, rply, rqstp->rq_addr, body, &rqstp->rq_reply_seq);
- if (rqstp->rq_addr) {
- free(rqstp->rq_addr, M_SONAME);
- rqstp->rq_addr = NULL;
- }
+ free(rqstp->rq_addr, M_SONAME);
+ rqstp->rq_addr = NULL;
return (ok);
}
@@ -912,10 +910,8 @@
case RS_DONE:
SVC_REPLY(xprt, &repmsg, r->rq_addr,
repbody, &r->rq_reply_seq);
- if (r->rq_addr) {
- free(r->rq_addr, M_SONAME);
- r->rq_addr = NULL;
- }
+ free(r->rq_addr, M_SONAME);
+ r->rq_addr = NULL;
m_freem(args);
goto call_done;
@@ -1398,10 +1394,8 @@
{
XDR xdrs;
- if (rqstp->rq_addr) {
- free(rqstp->rq_addr, M_SONAME);
- rqstp->rq_addr = NULL;
- }
+ free(rqstp->rq_addr, M_SONAME);
+ rqstp->rq_addr = NULL;
xdrs.x_op = XDR_FREE;
return (xargs(&xdrs, args));
Index: sys/tests/callout_test/callout_test.c
===================================================================
--- sys/tests/callout_test/callout_test.c
+++ sys/tests/callout_test/callout_test.c
@@ -200,10 +200,8 @@
rn->co_number_callouts = rn->co_return_npa = 0;
rn->co_completed = rn->callout_waiting = 0;
rn->drain_calls = rn->cnt_zero = rn->cnt_one = 0;
- if (rn->co_array) {
- free(rn->co_array, M_CALLTMP);
- rn->co_array = NULL;
- }
+ free(rn->co_array, M_CALLTMP);
+ rn->co_array = NULL;
}
rn->co_number_callouts = u->number_of_callouts;
rn->co_test = u->test_number;
@@ -224,10 +222,8 @@
for (i = 0; i < MAXCPU; i++) {
if (comaster[i]) {
- if (comaster[i]->co_array) {
- free(comaster[i]->co_array, M_CALLTMP);
- comaster[i]->co_array = NULL;
- }
+ free(comaster[i]->co_array, M_CALLTMP);
+ comaster[i]->co_array = NULL;
free(comaster[i], M_CALLTMP);
comaster[i] = NULL;
}
Index: sys/ufs/ffs/ffs_softdep.c
===================================================================
--- sys/ufs/ffs/ffs_softdep.c
+++ sys/ufs/ffs/ffs_softdep.c
@@ -7637,10 +7637,8 @@
inodedep->id_bmsafemap = NULL;
if (inodedep->id_state & ONWORKLIST)
WORKLIST_REMOVE(&inodedep->id_list);
- if (inodedep->id_savedino1 != NULL) {
- free(inodedep->id_savedino1, M_SAVEDINO);
- inodedep->id_savedino1 = NULL;
- }
+ free(inodedep->id_savedino1, M_SAVEDINO);
+ inodedep->id_savedino1 = NULL;
if (free_inodedep(inodedep) == 0)
panic("check_inode_unwritten: busy inode");
return (1);
Index: sys/ufs/ffs/ffs_vfsops.c
===================================================================
--- sys/ufs/ffs/ffs_vfsops.c
+++ sys/ufs/ffs/ffs_vfsops.c
@@ -1092,10 +1092,8 @@
}
if (ump) {
mtx_destroy(UFS_MTX(ump));
- if (mp->mnt_gjprovider != NULL) {
- free(mp->mnt_gjprovider, M_UFSMNT);
- mp->mnt_gjprovider = NULL;
- }
+ free(mp->mnt_gjprovider, M_UFSMNT);
+ mp->mnt_gjprovider = NULL;
free(ump->um_fs, M_UFSMNT);
free(ump, M_UFSMNT);
mp->mnt_data = NULL;
@@ -1290,10 +1288,8 @@
vrele(ump->um_devvp);
dev_rel(ump->um_dev);
mtx_destroy(UFS_MTX(ump));
- if (mp->mnt_gjprovider != NULL) {
- free(mp->mnt_gjprovider, M_UFSMNT);
- mp->mnt_gjprovider = NULL;
- }
+ free(mp->mnt_gjprovider, M_UFSMNT);
+ mp->mnt_gjprovider = NULL;
free(fs->fs_csp, M_UFSMNT);
free(fs, M_UFSMNT);
free(ump, M_UFSMNT);
Index: sys/xdr/xdr_sizeof.c
===================================================================
--- sys/xdr/xdr_sizeof.c
+++ sys/xdr/xdr_sizeof.c
@@ -121,10 +121,8 @@
xdrs->x_handy = 0;
xdrs->x_base = 0;
- if (xdrs->x_private) {
- free(xdrs->x_private, M_RPC);
- xdrs->x_private = NULL;
- }
+ free(xdrs->x_private, M_RPC);
+ xdrs->x_private = NULL;
return;
}
Index: sys/xen/xenbus/xenbusb.c
===================================================================
--- sys/xen/xenbus/xenbusb.c
+++ sys/xen/xenbus/xenbusb.c
@@ -95,21 +95,14 @@
ivars->xd_local_watch.node = NULL;
}
- if (ivars->xd_node != NULL) {
- free(ivars->xd_node, M_XENBUS);
- ivars->xd_node = NULL;
- }
+ free(ivars->xd_node, M_XENBUS);
+ ivars->xd_node = NULL;
ivars->xd_node_len = 0;
- if (ivars->xd_type != NULL) {
- free(ivars->xd_type, M_XENBUS);
- ivars->xd_type = NULL;
- }
-
- if (ivars->xd_otherend_path != NULL) {
- free(ivars->xd_otherend_path, M_XENBUS);
- ivars->xd_otherend_path = NULL;
- }
+ free(ivars->xd_type, M_XENBUS);
+ ivars->xd_type = NULL;
+ free(ivars->xd_otherend_path, M_XENBUS);
+ ivars->xd_otherend_path = NULL;
ivars->xd_otherend_path_len = 0;
free(ivars, M_XENBUS);
Index: sys/xen/xenbus/xenbusb_back.c
===================================================================
--- sys/xen/xenbus/xenbusb_back.c
+++ sys/xen/xenbus/xenbusb_back.c
@@ -196,10 +196,8 @@
char *otherend_path;
int error;
- if (ivars->xd_otherend_path != NULL) {
- free(ivars->xd_otherend_path, M_XENBUS);
- ivars->xd_otherend_path = NULL;
- }
+ free(ivars->xd_otherend_path, M_XENBUS);
+ ivars->xd_otherend_path = NULL;
error = xs_gather(XST_NIL, ivars->xd_node,
"frontend-id", "%i", &ivars->xd_otherend_id,
Index: sys/xen/xenbus/xenbusb_front.c
===================================================================
--- sys/xen/xenbus/xenbusb_front.c
+++ sys/xen/xenbus/xenbusb_front.c
@@ -144,10 +144,8 @@
char *otherend_path;
int error;
- if (ivars->xd_otherend_path != NULL) {
- free(ivars->xd_otherend_path, M_XENBUS);
- ivars->xd_otherend_path = NULL;
- }
+ free(ivars->xd_otherend_path, M_XENBUS);
+ ivars->xd_otherend_path = NULL;
error = xs_gather(XST_NIL, ivars->xd_node,
"backend-id", "%i", &ivars->xd_otherend_id,

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 16, 1:32 AM (41 m, 10 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31568324
Default Alt Text
D5904.id15059.diff (79 KB)

Event Timeline