From owner-svn-src-head@freebsd.org Tue Sep 1 22:08:28 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7CF7537E9F9; Tue, 1 Sep 2020 22:08:28 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Rc2nClz4g7K; Tue, 1 Sep 2020 22:08:28 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 42AC820784; Tue, 1 Sep 2020 22:08:28 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M8SuF056162; Tue, 1 Sep 2020 22:08:28 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M8Ru8056154; Tue, 1 Sep 2020 22:08:27 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012208.081M8Ru8056154@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:08:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365209 - head/sys/dev/mfi X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/mfi X-SVN-Commit-Revision: 365209 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:08:28 -0000 Author: mjg Date: Tue Sep 1 22:08:26 2020 New Revision: 365209 URL: https://svnweb.freebsd.org/changeset/base/365209 Log: mfi: clean up empty lines in .c and .h files Modified: head/sys/dev/mfi/mfi.c head/sys/dev/mfi/mfi_cam.c head/sys/dev/mfi/mfi_tbolt.c head/sys/dev/mfi/mfireg.h head/sys/dev/mfi/mfivar.h Modified: head/sys/dev/mfi/mfi.c ============================================================================== --- head/sys/dev/mfi/mfi.c Tue Sep 1 22:08:14 2020 (r365208) +++ head/sys/dev/mfi/mfi.c Tue Sep 1 22:08:26 2020 (r365209) @@ -362,7 +362,6 @@ mfi_addr_cb(void *arg, bus_dma_segment_t *segs, int ns *addr = segs[0].ds_addr; } - int mfi_attach(struct mfi_softc *sc) { @@ -422,7 +421,6 @@ mfi_attach(struct mfi_softc *sc) sc->mfi_issue_cmd = mfi_issue_cmd_ppc; } - /* Before we get too far, see if the firmware is working */ if ((error = mfi_transition_firmware(sc)) != 0) { device_printf(sc->mfi_dev, "Firmware not in READY state, " @@ -1330,7 +1328,6 @@ mfi_shutdown(struct mfi_softc *sc) struct mfi_command *cm; int error; - if (sc->mfi_aen_cm != NULL) { sc->cm_aen_abort = 1; mfi_abort(sc, &sc->mfi_aen_cm); @@ -2525,7 +2522,6 @@ mfi_std_send_frame(struct mfi_softc *sc, struct mfi_co return (0); } - void mfi_complete(struct mfi_softc *sc, struct mfi_command *cm) { @@ -2932,7 +2928,6 @@ mfi_check_for_sscd(struct mfi_softc *sc, struct mfi_co mfi_release_command(ld_cm); free(ld_info, M_MFIBUF); - } return error; } @@ -3031,7 +3026,6 @@ mfi_user_command(struct mfi_softc *sc, struct mfi_ioc_ void *ioc_buf = NULL; uint32_t context; int error = 0, locked; - if (ioc->buf_size > 0) { if (ioc->buf_size > 1024 * 1024) Modified: head/sys/dev/mfi/mfi_cam.c ============================================================================== --- head/sys/dev/mfi/mfi_cam.c Tue Sep 1 22:08:14 2020 (r365208) +++ head/sys/dev/mfi/mfi_cam.c Tue Sep 1 22:08:26 2020 (r365209) @@ -474,4 +474,3 @@ mfip_cam_poll(struct cam_sim *sim) mfisc->mfi_intr_ptr(mfisc); } - Modified: head/sys/dev/mfi/mfi_tbolt.c ============================================================================== --- head/sys/dev/mfi/mfi_tbolt.c Tue Sep 1 22:08:14 2020 (r365208) +++ head/sys/dev/mfi/mfi_tbolt.c Tue Sep 1 22:08:26 2020 (r365209) @@ -31,7 +31,6 @@ * official policies,either expressed or implied, of the FreeBSD Project. */ - #include __FBSDID("$FreeBSD$"); @@ -84,7 +83,6 @@ static void mfi_queue_map_sync(struct mfi_softc *sc); #define MFI_FUSION_ENABLE_INTERRUPT_MASK (0x00000008) - extern int mfi_polled_cmd_timeout; static int mfi_fw_reset_test = 0; #ifdef MFI_DEBUG @@ -135,7 +133,6 @@ mfi_tbolt_check_clear_intr_ppc(struct mfi_softc *sc) return 0; } - void mfi_tbolt_issue_cmd_ppc(struct mfi_softc *sc, bus_addr_t bus_add, uint32_t frame_cnt) @@ -804,7 +801,6 @@ mfi_tbolt_get_request_descriptor(struct mfi_softc *sc, return (union mfi_mpi2_request_descriptor *)p; } - /* Used to build IOCTL cmd */ uint8_t mfi_build_mpt_pass_thru(struct mfi_softc *sc, struct mfi_command *mfi_cmd) @@ -939,7 +935,6 @@ mfi_tbolt_build_io(struct mfi_softc *sc, struct mfi_co return 0; } - static int mfi_tbolt_make_sgl(struct mfi_softc *sc, struct mfi_command *mfi_cmd, pMpi25IeeeSgeChain64_t sgl_ptr, struct mfi_cmd_tbolt *cmd) @@ -1186,7 +1181,6 @@ mfi_issue_pending_cmds_again(struct mfi_softc *sc) mtx_assert(&sc->mfi_io_lock, MA_OWNED); TAILQ_FOREACH_REVERSE_SAFE(cm, &sc->mfi_busy, BUSYQ, cm_link, tmp) { - cm->retry_for_fw_reset++; /* Modified: head/sys/dev/mfi/mfireg.h ============================================================================== --- head/sys/dev/mfi/mfireg.h Tue Sep 1 22:08:14 2020 (r365208) +++ head/sys/dev/mfi/mfireg.h Tue Sep 1 22:08:26 2020 (r365209) @@ -307,7 +307,6 @@ typedef enum { #define MR_CTRL_EVENT_WAIT_SMID 2 #define MR_INTERNAL_DRIVER_RESET_SMID 3 - /* MFI Status codes */ typedef enum { MFI_STAT_OK = 0x00, @@ -1545,7 +1544,6 @@ typedef struct _MPI2_SCSI_IO_VENDOR_UNIQUE { #define MPI2_HEADER_VERSION ((MPI2_HEADER_VERSION_UNIT << 8) | \ MPI2_HEADER_VERSION_DEV) - /* IOCInit Request message */ struct MPI2_IOC_INIT_REQUEST { uint8_t WhoInit; /* 0x00 */ @@ -1685,7 +1683,6 @@ typedef struct { uint32_t TransferLength; /* 0x1C */ } MPI2_SCSI_IO_CDB_EEDP32; - typedef union _MPI2_IEEE_SGE_CHAIN_UNION { struct MPI2_IEEE_SGE_SIMPLE32 Chain32; struct MPI2_IEEE_SGE_SIMPLE64 Chain64; @@ -1709,7 +1706,6 @@ typedef union { MPI2_SGE_SIMPLE_UNION SGE; } MPI2_SCSI_IO_CDB_UNION; - /* MPI 2.5 SGLs */ #define MPI25_IEEE_SGE_FLAGS_END_OF_LIST (0x40) @@ -1724,7 +1720,6 @@ typedef struct _MPI25_IEEE_SGE_CHAIN64 { /* use MPI2_IEEE_SGE_FLAGS_ defines for the Flags field */ - /********/ /* @@ -1814,7 +1809,6 @@ union mfi_mpi2_request_descriptor { struct mfi_mpi2_request_scsi_target scsi_target; uint64_t words; }; - struct mfi_mpi2_reply_header { uint8_t ReplyFlags; /* 0x00 */ Modified: head/sys/dev/mfi/mfivar.h ============================================================================== --- head/sys/dev/mfi/mfivar.h Tue Sep 1 22:08:14 2020 (r365208) +++ head/sys/dev/mfi/mfivar.h Tue Sep 1 22:08:26 2020 (r365209) @@ -593,7 +593,6 @@ mfi_print_sense(struct mfi_softc *sc, void *sense) "asc %d, ascq %d\n", error, key, asc, ascq); } - #define MFI_WRITE4(sc, reg, val) bus_space_write_4((sc)->mfi_btag, \ sc->mfi_bhandle, (reg), (val)) #define MFI_READ4(sc, reg) bus_space_read_4((sc)->mfi_btag, \