Skip to contentSkip to conversation

nvme: delete unnecessary empty lines

PATCH Superseded Tokunori Ikegami 2 participants 3 messages Apr 18 – Apr 22

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nvme: delete unnecessary empty lines

Also fix a comment indentation error.

---
 drivers/nvme/host/apple.c | 1 -
 drivers/nvme/host/core.c  | 5 +----
 drivers/nvme/host/ioctl.c | 1 -
 3 files changed, 1 insertion(+), 6 deletions(-)
drivers/nvme/host/apple.c +0 -1
index ed61b97fde59..d1ced4f38a40 100644
@@ -1061,7 +1061,6 @@ static void apple_nvme_reset_work(struct work_struct *work)
 	 */
 	if (!(readl(anv->mmio_coproc + APPLE_ANS_COPROC_CPU_CONTROL) &
 		APPLE_ANS_COPROC_CPU_CONTROL_RUN)) {
-
 		ret = reset_control_assert(anv->reset);
 		if (ret)
 			goto out;
drivers/nvme/host/core.c +1 -4
index 1e33af94c24b..1f973d88c830 100644
@@ -1774,7 +1774,6 @@ static void nvme_enable_aen(struct nvme_ctrl *ctrl)
 
 static int nvme_ns_open(struct nvme_ns *ns)
 {
-
 	/* should never be called due to GENHD_FL_HIDDEN */
 	if (WARN_ON_ONCE(nvme_ns_head_multipath(ns->head)))
 		goto fail;
@@ -1793,7 +1792,6 @@ static int nvme_ns_open(struct nvme_ns *ns)
 
 static void nvme_ns_release(struct nvme_ns *ns)
 {
-
 	module_put(ns->ctrl->ops->module);
 	nvme_put_ns(ns);
 }
@@ -4684,14 +4682,13 @@ static void nvme_async_event_work(struct work_struct *work)
 	 * The transport drivers must guarantee AER submission here is safe by
 	 * flushing ctrl async_event_work after changing the controller state
 	 * from LIVE and before freeing the admin queue.
-	*/
+	 */
 	if (nvme_ctrl_state(ctrl) == NVME_CTRL_LIVE)
 		ctrl->ops->submit_async_event(ctrl);
 }
 
 static bool nvme_ctrl_pp_status(struct nvme_ctrl *ctrl)
 {
-
 	u32 csts;
 
 	if (ctrl->ops->reg_read32(ctrl, NVME_REG_CSTS, &csts))
drivers/nvme/host/ioctl.c +0 -1
index 9597a87cf05d..a5545dab70a8 100644
@@ -638,7 +638,6 @@ long nvme_ns_chr_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
 static int nvme_uring_cmd_checks(unsigned int issue_flags)
 {
-
 	/* NVMe passthrough requires big SQE/CQE support */
 	if ((issue_flags & (IO_URING_F_SQE128|IO_URING_F_CQE32)) !=
 	    (IO_URING_F_SQE128|IO_URING_F_CQE32))
Signature · 1 line
2.51.0
#1 lore raw
Quoted 1 line · Tokunori Ikegami

Also fix a comment indentation error.

What drives this? Like most subsystems we usually only take cleanups together with fixes in the same area.

drivers/nvme/host/apple.c static void apple_nvme_reset_work(struct work_struct *work) · line 1064

Quoted 3 lines
drivers/nvme/host/apple.c +0 -1
 	if (!(readl(anv->mmio_coproc + APPLE_ANS_COPROC_CPU_CONTROL) &
 		APPLE_ANS_COPROC_CPU_CONTROL_RUN)) {
-

The more important fix here would the incorrect indentation for the continuation of the condition above.

#2 lore raw
Quoted 2 lines · Christoph Hellwig

What drives this? Like most subsystems we usually only take cleanups together with fixes in the same area.

I checked the scan_work implementation then just found these unnecessary empty lines.
Also I sent the patch after checking the scan_work below also so I will send the both commits as v2 at same time later. [PATCH] nvme: set NCC and NIC effects for NS mgmt and attach

Quoted 2 lines

The more important fix here would the incorrect indentation for the continuation of the condition above.

Okay will do fix the incorrect indentation.