d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aacraid: rework r315083 for a clean build with and without AACRAID_DEBUG

Browse Source 
r315083 essentially reverted r263954 which was made for a good reason,
but didn't take into account AACRAID_DEBUG.
Now both types of build should be clean.

MFC after:	5 days
No MFC to:	stable/10
This commit is contained in:
avg 2017-03-23 11:59:17 +00:00
parent f10cdbf9d6
commit 7a7b340c4b
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/aacraid/aacraid_cam.c
View File

@ -243,13 +243,11 @@ static int
aac_cam_probe(device_t dev)
{
struct aac_cam *camsc;
struct aac_softc *sc;
camsc = (struct aac_cam *)device_get_softc(dev);
if (!camsc->inf)
return (0);
sc = camsc->inf->aac_sc;
fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
fwprintf(camsc->inf->aac_sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
return (0);
}
@ -1136,11 +1134,9 @@ static void
aac_container_complete(struct aac_command *cm)
{
union ccb *ccb;
struct aac_softc *sc;
u_int32_t status;
sc = cm->cm_sc;
fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
fwprintf(cm->cm_sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
ccb = cm->cm_ccb;
status = ((u_int32_t *)cm->cm_fib->data)[0];