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

mly: clean up empty lines in .c and .h files

Browse Source
This commit is contained in:
Mateusz Guzik 2020-09-01 22:07:37 +00:00
parent 56feefccc7
commit 5ef3520a33
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/mly/mly.c
View File

@ -123,7 +123,6 @@ static void mly_timeout(void *arg);
#endif #endif
void mly_print_controller(int controller); void mly_print_controller(int controller);
static d_open_t mly_user_open; static d_open_t mly_user_open;
static d_close_t mly_user_close; static d_close_t mly_user_close;
static d_ioctl_t mly_user_ioctl; static d_ioctl_t mly_user_ioctl;
@ -1411,7 +1410,6 @@ mly_periodic(void *data)
for (bus = 0; bus < sc->mly_cam_channels; bus++) { for (bus = 0; bus < sc->mly_cam_channels; bus++) {
if (MLY_BUS_IS_VALID(sc, bus)) { if (MLY_BUS_IS_VALID(sc, bus)) {
for (target = 0; target < MLY_MAX_TARGETS; target++) { for (target = 0; target < MLY_MAX_TARGETS; target++) {
/* ignore the controller in this scan */ /* ignore the controller in this scan */
if (target == sc->mly_controllerparam->initiator_id) if (target == sc->mly_controllerparam->initiator_id)
continue; continue;
@ -1504,7 +1502,7 @@ mly_start(struct mly_command *mc)
return(EBUSY); return(EBUSY);
} }
mc->mc_flags |= MLY_CMD_BUSY; mc->mc_flags |= MLY_CMD_BUSY;
/* /*
* It's ready, send the command. * It's ready, send the command.
*/ */
@ -1520,7 +1518,7 @@ mly_start(struct mly_command *mc)
return(EBUSY); return(EBUSY);
} }
mc->mc_flags |= MLY_CMD_BUSY; mc->mc_flags |= MLY_CMD_BUSY;
/* copy in new command */ /* copy in new command */
bcopy(mc->mc_packet->mmbox.data, pkt->mmbox.data, sizeof(pkt->mmbox.data)); bcopy(mc->mc_packet->mmbox.data, pkt->mmbox.data, sizeof(pkt->mmbox.data));
/* barrier to ensure completion of previous write before we write the flag */ /* barrier to ensure completion of previous write before we write the flag */
@ -1641,7 +1639,6 @@ mly_complete(struct mly_softc *sc)
* Spin pulling commands off the completed queue and processing them. * Spin pulling commands off the completed queue and processing them.
*/ */
while ((mc = mly_dequeue_complete(sc)) != NULL) { while ((mc = mly_dequeue_complete(sc)) != NULL) {
/* /*
* Free controller resources, mark command complete. * Free controller resources, mark command complete.
* *
@ -1746,7 +1743,7 @@ mly_alloc_commands(struct mly_softc *sc)
{ {
struct mly_command *mc; struct mly_command *mc;
int i, ncmd; int i, ncmd;
if (sc->mly_controllerinfo == NULL) { if (sc->mly_controllerinfo == NULL) {
ncmd = 4; ncmd = 4;
} else { } else {
@ -1801,7 +1798,6 @@ mly_release_commands(struct mly_softc *sc)
} }
} }
/******************************************************************************** /********************************************************************************
* Command-mapping helper function - populate this command's s/g table * Command-mapping helper function - populate this command's s/g table
* with the s/g entries for its data. * with the s/g entries for its data.
@ -1916,7 +1912,6 @@ mly_unmap_command(struct mly_command *mc)
mc->mc_flags &= ~MLY_CMD_MAPPED; mc->mc_flags &= ~MLY_CMD_MAPPED;
} }
/******************************************************************************** /********************************************************************************
******************************************************************************** ********************************************************************************
CAM interface CAM interface
@ -1958,7 +1953,6 @@ mly_cam_attach(struct mly_softc *sc)
if (testenv("hw.mly.register_physical_channels")) { if (testenv("hw.mly.register_physical_channels")) {
chn = 0; chn = 0;
for (i = 0; i < sc->mly_controllerinfo->physical_channels_present; i++, chn++) { for (i = 0; i < sc->mly_controllerinfo->physical_channels_present; i++, chn++) {
if ((sc->mly_cam_sim[chn] = cam_sim_alloc(mly_cam_action, mly_cam_poll, "mly", sc, if ((sc->mly_cam_sim[chn] = cam_sim_alloc(mly_cam_action, mly_cam_poll, "mly", sc,
device_get_unit(sc->mly_dev), device_get_unit(sc->mly_dev),
&sc->mly_lock, &sc->mly_lock,
@ -2067,7 +2061,6 @@ mly_cam_action(struct cam_sim *sim, union ccb *ccb)
MLY_ASSERT_LOCKED(sc); MLY_ASSERT_LOCKED(sc);
switch (ccb->ccb_h.func_code) { switch (ccb->ccb_h.func_code) {
/* perform SCSI I/O */ /* perform SCSI I/O */
case XPT_SCSI_IO: case XPT_SCSI_IO:
if (!mly_cam_action_io(sim, (struct ccb_scsiio *)&ccb->csio)) if (!mly_cam_action_io(sim, (struct ccb_scsiio *)&ccb->csio))
@ -2817,7 +2810,6 @@ mly_print_controller(int controller)
} }
#endif #endif
/******************************************************************************** /********************************************************************************
******************************************************************************** ********************************************************************************
Control device interface Control device interface

1
sys/dev/mly/mlyvar.h
View File

@ -309,7 +309,6 @@ struct mly_softc {
sc->mly_qstat[qname].q_max = 0; \ sc->mly_qstat[qname].q_max = 0; \
} while(0) } while(0)
#define MLYQ_COMMAND_QUEUE(name, index) \ #define MLYQ_COMMAND_QUEUE(name, index) \
static __inline void \ static __inline void \
mly_initq_ ## name (struct mly_softc *sc) \ mly_initq_ ## name (struct mly_softc *sc) \