diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c index e4a4ec102d20..6e3cca084fe0 100644 --- a/sys/dev/aac/aac.c +++ b/sys/dev/aac/aac.c @@ -1029,7 +1029,6 @@ aac_command_thread(struct aac_softc *sc) sc->aifflags = AAC_AIFFLAGS_RUNNING; while ((sc->aifflags & AAC_AIFFLAGS_EXIT) == 0) { - retval = 0; if ((sc->aifflags & AAC_AIFFLAGS_PENDING) == 0) retval = msleep(sc->aifthread, &sc->aac_io_lock, PRIBIO, @@ -1533,7 +1532,6 @@ aac_free_commands(struct aac_softc *sc) fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); while ((fm = TAILQ_FIRST(&sc->aac_fibmap_tqh)) != NULL) { - TAILQ_REMOVE(&sc->aac_fibmap_tqh, fm, fm_link); /* * We check against total_fibs to handle partially diff --git a/sys/dev/aac/aac_cam.c b/sys/dev/aac/aac_cam.c index 2e95b6da1409..4de1ab9a3164 100644 --- a/sys/dev/aac/aac_cam.c +++ b/sys/dev/aac/aac_cam.c @@ -144,7 +144,6 @@ aac_cam_rescan(struct aac_softc *sc, uint32_t channel, uint32_t target_id) } } - static void aac_cam_event(struct aac_softc *sc, struct aac_event *event, void *arg) { diff --git a/sys/dev/aac/aac_debug.c b/sys/dev/aac/aac_debug.c index b1d79b92250e..edee5455c594 100644 --- a/sys/dev/aac/aac_debug.c +++ b/sys/dev/aac/aac_debug.c @@ -392,7 +392,7 @@ aac_print_aif(struct aac_softc *sc, struct aac_aif_command *aif) default: status = "unknown status"; break; } - + device_printf(sc->aac_dev, "JobProgress (%d) - %s (%d, %d)\n", aif->seqNumber, status, aif->data.PR[0].currentTick, diff --git a/sys/dev/aac/aac_disk.c b/sys/dev/aac/aac_disk.c index 284c1472d7ea..5eeb802b103d 100644 --- a/sys/dev/aac/aac_disk.c +++ b/sys/dev/aac/aac_disk.c @@ -100,7 +100,7 @@ aac_disk_open(struct disk *dp) fwprintf(NULL, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); sc = (struct aac_disk *)dp->d_drv1; - + if (sc == NULL) { printf("aac_disk_open: No Softc\n"); return (ENXIO); @@ -129,7 +129,7 @@ aac_disk_close(struct disk *dp) fwprintf(NULL, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); sc = (struct aac_disk *)dp->d_drv1; - + if (sc == NULL) return (ENXIO); @@ -366,7 +366,7 @@ static int aac_disk_attach(device_t dev) { struct aac_disk *sc; - + sc = (struct aac_disk *)device_get_softc(dev); fwprintf(NULL, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); diff --git a/sys/dev/aac/aacreg.h b/sys/dev/aac/aacreg.h index d0800f3d5881..665b2cc35b3c 100644 --- a/sys/dev/aac/aacreg.h +++ b/sys/dev/aac/aacreg.h @@ -1563,4 +1563,3 @@ enum { AAC_DB_RESPONSE_READY | \ AAC_DB_PRINTF) #define AAC_DB_INT_NEW_COMM 0x08 -