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

scsi: aic7xxx: aic97xx: Remove FreeBSD-specific code 

The file aic79xx_core.c still contains some FreeBSD-specific code/macro
guards, although cross-compatibility was in theory removed with commit
cca6cb8a ("scsi: aic7xxx: Fix build using bare-metal toolchain").
Remove it.

Link: https://lore.kernel.org/r/20200326193817.12568-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 e89860f1

drivers/scsi/aic7xxx/aic79xx_core.c

+1 −21
Original line number Diff line number Diff line
@@ -3107,19 +3107,6 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd) 
			printerror = 0;

		} else if (ahd_sent_msg(ahd, AHDMSG_1B,

					MSG_BUS_DEV_RESET, TRUE)) {

#ifdef __FreeBSD__

			/*

			 * Don't mark the user's request for this BDR

			 * as completing with CAM_BDR_SENT.  CAM3

			 * specifies CAM_REQ_CMP.

			 */

			if (scb != NULL

			 && scb->io_ctx->ccb_h.func_code== XPT_RESET_DEV

			 && ahd_match_scb(ahd, scb, target, 'A',

					  CAM_LUN_WILDCARD, SCB_LIST_NULL,

					  ROLE_INITIATOR))

				ahd_set_transaction_status(scb, CAM_REQ_CMP);

#endif

			ahd_handle_devreset(ahd, &devinfo, CAM_LUN_WILDCARD,

					    CAM_BDR_SENT, "Bus Device Reset",

					    /*verbose_level*/0);
@@ -6067,22 +6054,17 @@ ahd_alloc(void *platform_arg, char *name) 
{

	struct  ahd_softc *ahd;



#ifndef	__FreeBSD__

	ahd = kmalloc(sizeof(*ahd), GFP_ATOMIC);

	if (!ahd) {

		printk("aic7xxx: cannot malloc softc!\n");

		kfree(name);

		return NULL;

	}

#else

	ahd = device_get_softc((device_t)platform_arg);

#endif



	memset(ahd, 0, sizeof(*ahd));

	ahd->seep_config = kmalloc(sizeof(*ahd->seep_config), GFP_ATOMIC);

	if (ahd->seep_config == NULL) {

#ifndef	__FreeBSD__

		kfree(ahd);

#endif

		kfree(name);

		return (NULL);

	}
@@ -6206,9 +6188,7 @@ ahd_free(struct ahd_softc *ahd) 
		kfree(ahd->seep_config);

	if (ahd->saved_stack != NULL)

		kfree(ahd->saved_stack);

#ifndef __FreeBSD__

	kfree(ahd);

#endif

	return;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE