Date: Tue, 1 Sep 2020 21:32:26 +0000 (UTC) From: Mateusz Guzik <mjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365095 - head/sys/dev/aacraid Message-ID: <202009012132.081LWQMY031549@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mjg Date: Tue Sep 1 21:32:25 2020 New Revision: 365095 URL: https://svnweb.freebsd.org/changeset/base/365095 Log: aacraid: clean up empty lines in .c and .h files Modified: head/sys/dev/aacraid/aacraid.c head/sys/dev/aacraid/aacraid_debug.c head/sys/dev/aacraid/aacraid_endian.h head/sys/dev/aacraid/aacraid_reg.h head/sys/dev/aacraid/aacraid_var.h Modified: head/sys/dev/aacraid/aacraid.c ============================================================================== --- head/sys/dev/aacraid/aacraid.c Tue Sep 1 21:32:07 2020 (r365094) +++ head/sys/dev/aacraid/aacraid.c Tue Sep 1 21:32:25 2020 (r365095) @@ -1023,7 +1023,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, @@ -1267,7 +1266,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 @@ -1451,7 +1449,6 @@ aacraid_map_command_sg(void *arg, bus_dma_segment_t *s } } - static int aac_convert_sgraw2(struct aac_softc *sc, struct aac_raw_io2 *raw, int pages, int nseg, int nseg_new) @@ -1488,7 +1485,6 @@ aac_convert_sgraw2(struct aac_softc *sc, struct aac_ra return nseg_new; } - /* * Unmap a command from controller-visible space. */ @@ -1851,7 +1847,7 @@ aac_define_int_mode(struct aac_softc *sc) device_t dev; int cap, msi_count, error = 0; uint32_t val; - + dev = sc->aac_dev; if (sc->flags & AAC_FLAGS_SYNC_MODE) { @@ -2377,7 +2373,7 @@ aac_src_access_devreg(struct aac_softc *sc, int mode) AAC_MEM0_SETREG4(sc, AAC_SRC_OIMR, val & (~(PMC_GLOBAL_INT_BIT2))); break; - + default: break; } @@ -2398,7 +2394,7 @@ aac_src_send_command(struct aac_softc *sc, struct aac_ if (sc->msi_enabled && cm->cm_fib->Header.Command != AifRequest && sc->aac_max_msix > 1) { u_int16_t vector_no, first_choice = 0xffff; - + vector_no = sc->aac_fibs_pushed_no % sc->aac_max_msix; do { vector_no += 1; @@ -3102,7 +3098,6 @@ aac_request_aif(struct aac_softc *sc) aacraid_map_command_sg(cm, NULL, 0, 0); } - /* * cdevpriv interface private destructor. Modified: head/sys/dev/aacraid/aacraid_debug.c ============================================================================== --- head/sys/dev/aacraid/aacraid_debug.c Tue Sep 1 21:32:07 2020 (r365094) +++ head/sys/dev/aacraid/aacraid_debug.c Tue Sep 1 21:32:25 2020 (r365095) @@ -305,7 +305,7 @@ aacraid_print_aif(struct aac_softc *sc, struct aac_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, @@ -704,7 +704,6 @@ void aacraid_fw_print_mem(struct aac_softc *sc, unsign * Bump the offset by 16 for the next line */ Offset += 16; - } /* @@ -713,4 +712,3 @@ void aacraid_fw_print_mem(struct aac_softc *sc, unsign if (sc != NULL) sc->FwDebugFlags = DebugFlags; } - Modified: head/sys/dev/aacraid/aacraid_endian.h ============================================================================== --- head/sys/dev/aacraid/aacraid_endian.h Tue Sep 1 21:32:07 2020 (r365094) +++ head/sys/dev/aacraid/aacraid_endian.h Tue Sep 1 21:32:25 2020 (r365095) @@ -71,7 +71,6 @@ #define aac_blockread64_tole(ptr) #define aac_blockwrite64_tole(ptr) - #else /* _BYTE_ORDER != _LITTLE_ENDIAN */ /* Convert from Little-Endian to host order (TOH) */ Modified: head/sys/dev/aacraid/aacraid_reg.h ============================================================================== --- head/sys/dev/aacraid/aacraid_reg.h Tue Sep 1 21:32:07 2020 (r365094) +++ head/sys/dev/aacraid/aacraid_reg.h Tue Sep 1 21:32:25 2020 (r365095) @@ -1342,7 +1342,6 @@ typedef enum { CMUNSTABLE } AAC_CommitLevel; - #define CT_FIB_PARAMS 6 #define MAX_FIB_PARAMS 10 #define CT_PACKET_SIZE \ @@ -1589,7 +1588,6 @@ enum { /* Sunrise Lake dual core reset */ #define AAC_IRCSR 0x38 /* inbound dual cores reset */ #define AAC_IRCSR_CORES_RST 3 - /* * Common bit definitions for the doorbell registers. Modified: head/sys/dev/aacraid/aacraid_var.h ============================================================================== --- head/sys/dev/aacraid/aacraid_var.h Tue Sep 1 21:32:07 2020 (r365094) +++ head/sys/dev/aacraid/aacraid_var.h Tue Sep 1 21:32:25 2020 (r365095) @@ -235,7 +235,7 @@ struct aac_common { /* buffer for text messages from the controller */ char ac_printf[AAC_PRINTF_BUFSIZE]; - + /* fib for synchronous commands */ struct aac_fib ac_sync_fib; @@ -555,7 +555,6 @@ struct aac_code_lookup { sc->aac_qstat[qname].q_length = 0; \ sc->aac_qstat[qname].q_max = 0; \ } while (0) - #define AACQ_COMMAND_QUEUE(name, index) \ static __inline void \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009012132.081LWQMY031549>