@@ -1834,21 +1834,6 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat)
1834
1834
printerror = 0 ;
1835
1835
} else if (ahc_sent_msg (ahc , AHCMSG_1B ,
1836
1836
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
1852
1837
ahc_compile_devinfo (& devinfo ,
1853
1838
initiator_role_id ,
1854
1839
target ,
@@ -4399,22 +4384,16 @@ ahc_alloc(void *platform_arg, char *name)
4399
4384
struct ahc_softc * ahc ;
4400
4385
int i ;
4401
4386
4402
- #ifndef __FreeBSD__
4403
4387
ahc = kmalloc (sizeof (* ahc ), GFP_ATOMIC );
4404
4388
if (!ahc ) {
4405
4389
printk ("aic7xxx: cannot malloc softc!\n" );
4406
4390
kfree (name );
4407
4391
return NULL ;
4408
4392
}
4409
- #else
4410
- ahc = device_get_softc ((device_t )platform_arg );
4411
- #endif
4412
4393
memset (ahc , 0 , sizeof (* ahc ));
4413
4394
ahc -> seep_config = kmalloc (sizeof (* ahc -> seep_config ), GFP_ATOMIC );
4414
4395
if (ahc -> seep_config == NULL ) {
4415
- #ifndef __FreeBSD__
4416
4396
kfree (ahc );
4417
- #endif
4418
4397
kfree (name );
4419
4398
return (NULL );
4420
4399
}
@@ -4540,9 +4519,7 @@ ahc_free(struct ahc_softc *ahc)
4540
4519
kfree (ahc -> name );
4541
4520
if (ahc -> seep_config != NULL )
4542
4521
kfree (ahc -> seep_config );
4543
- #ifndef __FreeBSD__
4544
4522
kfree (ahc );
4545
- #endif
4546
4523
return ;
4547
4524
}
4548
4525
0 commit comments