Skip to content

Commit 0d2b595

Browse files
alexdewarmartinkpetersen
authored andcommitted
scsi: aic7xxx: Remove more FreeBSD-specific code
Remove additional code for FreeBSD in aic7xxx_core.c, which is unneeded since commit cca6cb8 ("scsi: aic7xxx: Fix build using bare-metal toolchain"). Link: https://lore.kernel.org/r/[email protected] Suggested-by: Martin Petersen <[email protected]> Signed-off-by: Alex Dewar <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent cc41f11 commit 0d2b595

File tree

1 file changed

+0
-23
lines changed

1 file changed

+0
-23
lines changed

drivers/scsi/aic7xxx/aic7xxx_core.c

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1834,21 +1834,6 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat)
18341834
printerror = 0;
18351835
} else if (ahc_sent_msg(ahc, AHCMSG_1B,
18361836
MSG_BUS_DEV_RESET, TRUE)) {
1837-
#ifdef __FreeBSD__
1838-
/*
1839-
* Don't mark the user's request for this BDR
1840-
* as completing with CAM_BDR_SENT. CAM3
1841-
* specifies CAM_REQ_CMP.
1842-
*/
1843-
if (scb != NULL
1844-
&& scb->io_ctx->ccb_h.func_code== XPT_RESET_DEV
1845-
&& ahc_match_scb(ahc, scb, target, channel,
1846-
CAM_LUN_WILDCARD,
1847-
SCB_LIST_NULL,
1848-
ROLE_INITIATOR)) {
1849-
ahc_set_transaction_status(scb, CAM_REQ_CMP);
1850-
}
1851-
#endif
18521837
ahc_compile_devinfo(&devinfo,
18531838
initiator_role_id,
18541839
target,
@@ -4399,22 +4384,16 @@ ahc_alloc(void *platform_arg, char *name)
43994384
struct ahc_softc *ahc;
44004385
int i;
44014386

4402-
#ifndef __FreeBSD__
44034387
ahc = kmalloc(sizeof(*ahc), GFP_ATOMIC);
44044388
if (!ahc) {
44054389
printk("aic7xxx: cannot malloc softc!\n");
44064390
kfree(name);
44074391
return NULL;
44084392
}
4409-
#else
4410-
ahc = device_get_softc((device_t)platform_arg);
4411-
#endif
44124393
memset(ahc, 0, sizeof(*ahc));
44134394
ahc->seep_config = kmalloc(sizeof(*ahc->seep_config), GFP_ATOMIC);
44144395
if (ahc->seep_config == NULL) {
4415-
#ifndef __FreeBSD__
44164396
kfree(ahc);
4417-
#endif
44184397
kfree(name);
44194398
return (NULL);
44204399
}
@@ -4540,9 +4519,7 @@ ahc_free(struct ahc_softc *ahc)
45404519
kfree(ahc->name);
45414520
if (ahc->seep_config != NULL)
45424521
kfree(ahc->seep_config);
4543-
#ifndef __FreeBSD__
45444522
kfree(ahc);
4545-
#endif
45464523
return;
45474524
}
45484525

0 commit comments

Comments
 (0)