mfi: clean up empty lines in .c and .h files
This commit is contained in:
parent
fc32241fc8
commit
f0782e02a2
@ -362,7 +362,6 @@ mfi_addr_cb(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
|
||||
*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_command *cm)
|
||||
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_command *cm)
|
||||
|
||||
mfi_release_command(ld_cm);
|
||||
free(ld_info, M_MFIBUF);
|
||||
|
||||
}
|
||||
return error;
|
||||
}
|
||||
@ -3032,7 +3027,6 @@ mfi_user_command(struct mfi_softc *sc, struct mfi_ioc_passthru *ioc)
|
||||
uint32_t context;
|
||||
int error = 0, locked;
|
||||
|
||||
|
||||
if (ioc->buf_size > 0) {
|
||||
if (ioc->buf_size > 1024 * 1024)
|
||||
return (ENOMEM);
|
||||
|
@ -474,4 +474,3 @@ mfip_cam_poll(struct cam_sim *sim)
|
||||
|
||||
mfisc->mfi_intr_ptr(mfisc);
|
||||
}
|
||||
|
||||
|
@ -31,7 +31,6 @@
|
||||
* official policies,either expressed or implied, of the FreeBSD Project.
|
||||
*/
|
||||
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__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, uint16_t index)
|
||||
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_command *mfi_cmd,
|
||||
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++;
|
||||
|
||||
/*
|
||||
|
@ -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 */
|
||||
|
||||
|
||||
/********/
|
||||
|
||||
/*
|
||||
@ -1815,7 +1810,6 @@ union mfi_mpi2_request_descriptor {
|
||||
uint64_t words;
|
||||
};
|
||||
|
||||
|
||||
struct mfi_mpi2_reply_header {
|
||||
uint8_t ReplyFlags; /* 0x00 */
|
||||
uint8_t MSIxIndex; /* 0x01 */
|
||||
|
@ -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, \
|
||||
|
Loading…
Reference in New Issue
Block a user