Skip to content

Commit ff275db

Browse files
alexdewarmartinkpetersen
authored andcommitted
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 cca6cb8 ("scsi: aic7xxx: Fix build using bare-metal toolchain"). Remove it. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Alex Dewar <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent e89860f commit ff275db

File tree

1 file changed

+1
-21
lines changed

1 file changed

+1
-21
lines changed

drivers/scsi/aic7xxx/aic79xx_core.c

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3107,19 +3107,6 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
31073107
printerror = 0;
31083108
} else if (ahd_sent_msg(ahd, AHDMSG_1B,
31093109
MSG_BUS_DEV_RESET, TRUE)) {
3110-
#ifdef __FreeBSD__
3111-
/*
3112-
* Don't mark the user's request for this BDR
3113-
* as completing with CAM_BDR_SENT. CAM3
3114-
* specifies CAM_REQ_CMP.
3115-
*/
3116-
if (scb != NULL
3117-
&& scb->io_ctx->ccb_h.func_code== XPT_RESET_DEV
3118-
&& ahd_match_scb(ahd, scb, target, 'A',
3119-
CAM_LUN_WILDCARD, SCB_LIST_NULL,
3120-
ROLE_INITIATOR))
3121-
ahd_set_transaction_status(scb, CAM_REQ_CMP);
3122-
#endif
31233110
ahd_handle_devreset(ahd, &devinfo, CAM_LUN_WILDCARD,
31243111
CAM_BDR_SENT, "Bus Device Reset",
31253112
/*verbose_level*/0);
@@ -6067,22 +6054,17 @@ ahd_alloc(void *platform_arg, char *name)
60676054
{
60686055
struct ahd_softc *ahd;
60696056

6070-
#ifndef __FreeBSD__
60716057
ahd = kmalloc(sizeof(*ahd), GFP_ATOMIC);
60726058
if (!ahd) {
60736059
printk("aic7xxx: cannot malloc softc!\n");
60746060
kfree(name);
60756061
return NULL;
60766062
}
6077-
#else
6078-
ahd = device_get_softc((device_t)platform_arg);
6079-
#endif
6063+
60806064
memset(ahd, 0, sizeof(*ahd));
60816065
ahd->seep_config = kmalloc(sizeof(*ahd->seep_config), GFP_ATOMIC);
60826066
if (ahd->seep_config == NULL) {
6083-
#ifndef __FreeBSD__
60846067
kfree(ahd);
6085-
#endif
60866068
kfree(name);
60876069
return (NULL);
60886070
}
@@ -6206,9 +6188,7 @@ ahd_free(struct ahd_softc *ahd)
62066188
kfree(ahd->seep_config);
62076189
if (ahd->saved_stack != NULL)
62086190
kfree(ahd->saved_stack);
6209-
#ifndef __FreeBSD__
62106191
kfree(ahd);
6211-
#endif
62126192
return;
62136193
}
62146194

0 commit comments

Comments
 (0)