diff options
author | Mateusz Guzik <mjg@FreeBSD.org> | 2020-09-01 22:13:48 +0000 |
---|---|---|
committer | Mateusz Guzik <mjg@FreeBSD.org> | 2020-09-01 22:13:48 +0000 |
commit | 27dcd3d90b41d3c89eac3c2b50b9a6f515e5c89d (patch) | |
tree | 4a7e8650e9713823d6fca69814a67a415da1f6d3 /sys/cam/nvme | |
parent | 985b8ee8d299302b1e711d25db0c65ba0a0f1b47 (diff) | |
download | src-27dcd3d90b41d3c89eac3c2b50b9a6f515e5c89d.tar.gz src-27dcd3d90b41d3c89eac3c2b50b9a6f515e5c89d.zip |
cam: clean up empty lines in .c and .h files
Notes
Notes:
svn path=/head/; revision=365225
Diffstat (limited to 'sys/cam/nvme')
-rw-r--r-- | sys/cam/nvme/nvme_all.c | 1 | ||||
-rw-r--r-- | sys/cam/nvme/nvme_da.c | 14 | ||||
-rw-r--r-- | sys/cam/nvme/nvme_xpt.c | 1 |
3 files changed, 6 insertions, 10 deletions
diff --git a/sys/cam/nvme/nvme_all.c b/sys/cam/nvme/nvme_all.c index 9ed16df40852..c7cf4ea29dd7 100644 --- a/sys/cam/nvme/nvme_all.c +++ b/sys/cam/nvme/nvme_all.c @@ -85,7 +85,6 @@ nvme_identify_match(caddr_t identbuffer, caddr_t table_entry) return 0; } - void nvme_print_ident(const struct nvme_controller_data *cdata, const struct nvme_namespace_data *data, struct sbuf *sb) diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 892dee5a9959..6ff2388a63f8 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -86,7 +86,7 @@ typedef enum { NDA_Q_4K = 0x01, NDA_Q_NONE = 0x00, } nda_quirks; - + #define NDA_Q_BIT_STRING \ "\020" \ "\001Bit 0" @@ -335,7 +335,6 @@ ndaclose(struct disk *dp) if ((softc->flags & NDA_FLAG_DIRTY) != 0 && (periph->flags & CAM_PERIPH_INVALID) == 0 && cam_periph_hold(periph, PRIBIO) == 0) { - ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL); nda_nvme_flush(softc, &ccb->nvmeio); error = cam_periph_runccb(ccb, ndaerror, /*cam_flags*/0, @@ -467,7 +466,7 @@ ndastrategy(struct bio *bp) { struct cam_periph *periph; struct nda_softc *softc; - + periph = (struct cam_periph *)bp->bio_disk->d_drv1; softc = (struct nda_softc *)periph->softc; @@ -483,7 +482,7 @@ ndastrategy(struct bio *bp) biofinish(bp, NULL, ENXIO); return; } - + if (bp->bio_cmd == BIO_DELETE) softc->deletes++; @@ -519,7 +518,7 @@ ndadump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t len secsize = softc->disk->d_sectorsize; lba = offset / secsize; count = length / secsize; - + if ((periph->flags & CAM_PERIPH_INVALID) != 0) return (ENXIO); @@ -536,7 +535,7 @@ ndadump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t len return (error); } - + /* Flush */ xpt_setup_ccb(&nvmeio.ccb_h, periph->path, CAM_PRIORITY_NORMAL); @@ -564,7 +563,6 @@ ndainit(void) printf("nda: Failed to attach master async callback " "due to status 0x%x!\n", status); } else if (nda_send_ordered) { - /* Register our event handlers */ if ((EVENTHANDLER_REGISTER(power_suspend, ndasuspend, NULL, EVENTHANDLER_PRI_LAST)) == NULL) @@ -656,7 +654,7 @@ ndaasync(void *callback_arg, u_int32_t code, { struct ccb_getdev *cgd; cam_status status; - + cgd = (struct ccb_getdev *)arg; if (cgd == NULL) break; diff --git a/sys/cam/nvme/nvme_xpt.c b/sys/cam/nvme/nvme_xpt.c index fbb9cf19d839..126b284936bb 100644 --- a/sys/cam/nvme/nvme_xpt.c +++ b/sys/cam/nvme/nvme_xpt.c @@ -849,4 +849,3 @@ nvme_proto_debug_out(union ccb *ccb) ccb->ccb_h.func_code == XPT_NVME_ADMIN), nvme_cmd_string(&ccb->nvmeio.cmd, cdb_str, sizeof(cdb_str)))); } - |