Commit d1ec20a5 authored by Alex Dewar's avatar Alex Dewar Committed by Martin K. Petersen
Browse files

scsi: aic7xxx: Remove unnecessary NULL checks before kfree 

There are a number of places in the aic7xxx driver where a NULL check is
performed before a kfree(). However, kfree() already performs NULL checks
so this is unnecessary. Remove the checks.

Issue identified with Coccinelle.

Link: https://lore.kernel.org/r/20200403164712.49579-1-alex.dewar@gmx.co.uk


Signed-off-by: default avatarAlex Dewar <alex.dewar@gmx.co.uk>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 9cd7d494

drivers/scsi/aic7xxx/aic79xx_core.c

+5 −10
Original line number Diff line number Diff line
@@ -3662,7 +3662,6 @@ ahd_free_tstate(struct ahd_softc *ahd, u_int scsi_id, char channel, int force) 
		return;



	tstate = ahd->enabled_targets[scsi_id];

	if (tstate != NULL)

	kfree(tstate);

	ahd->enabled_targets[scsi_id] = NULL;

}
@@ -6119,7 +6118,6 @@ ahd_set_unit(struct ahd_softc *ahd, int unit) 
void

ahd_set_name(struct ahd_softc *ahd, char *name)

{

	if (ahd->name != NULL)

	kfree(ahd->name);

	ahd->name = name;

}
@@ -6181,11 +6179,8 @@ ahd_free(struct ahd_softc *ahd) 
		kfree(ahd->black_hole);

	}

#endif

	if (ahd->name != NULL)

	kfree(ahd->name);

	if (ahd->seep_config != NULL)

	kfree(ahd->seep_config);

	if (ahd->saved_stack != NULL)

	kfree(ahd->saved_stack);

	kfree(ahd);

	return;

drivers/scsi/aic7xxx/aic7xxx_core.c

+5 −10
Original line number Diff line number Diff line
@@ -2178,7 +2178,6 @@ ahc_free_tstate(struct ahc_softc *ahc, u_int scsi_id, char channel, int force) 
	if (channel == 'B')

		scsi_id += 8;

	tstate = ahc->enabled_targets[scsi_id];

	if (tstate != NULL)

	kfree(tstate);

	ahc->enabled_targets[scsi_id] = NULL;

}
@@ -4453,7 +4452,6 @@ ahc_set_unit(struct ahc_softc *ahc, int unit) 
void

ahc_set_name(struct ahc_softc *ahc, char *name)

{

	if (ahc->name != NULL)

	kfree(ahc->name);

	ahc->name = name;

}
@@ -4515,9 +4513,7 @@ ahc_free(struct ahc_softc *ahc) 
		kfree(ahc->black_hole);

	}

#endif

	if (ahc->name != NULL)

	kfree(ahc->name);

	if (ahc->seep_config != NULL)

	kfree(ahc->seep_config);

	kfree(ahc);

	return;
@@ -4927,7 +4923,6 @@ ahc_fini_scbdata(struct ahc_softc *ahc) 
	case 0:

		break;

	}

	if (scb_data->scbarray != NULL)

	kfree(scb_data->scbarray);

}