diff --git a/scst/include/scst_debug.h b/scst/include/scst_debug.h
index 9c075c3f0..062d0bf2f 100644
--- a/scst/include/scst_debug.h
+++ b/scst/include/scst_debug.h
@@ -406,6 +406,6 @@ do {								\
 		__warned = true;				\
 		PRINT_WARNING(format, ## args);			\
 	}							\
-} while(0)
+} while (0)
 
 #endif /* __SCST_DEBUG_H */
diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c
index fed13e041..6203d7e12 100644
--- a/scst/src/dev_handlers/scst_vdisk.c
+++ b/scst/src/dev_handlers/scst_vdisk.c
@@ -6846,7 +6846,7 @@ static void blockio_exec_rw(struct vdisk_cmd_params *p, bool write, bool fua)
 		static int err_inj_cntr;
 
 		if (++err_inj_cntr % 256 == 0) {
-			PRINT_INFO("blockio_exec_rw() error injection");
+			PRINT_INFO("%s() error injection", __func__);
 			scst_set_busy(cmd);
 			goto free_bio;
 		}
diff --git a/scst/src/scst_targ.c b/scst/src/scst_targ.c
index 1f1ed698f..e19acf0c1 100644
--- a/scst/src/scst_targ.c
+++ b/scst/src/scst_targ.c
@@ -2027,7 +2027,7 @@ void scst_rx_data(struct scst_cmd *cmd, int status,
 		break;
 
 	default:
-		PRINT_ERROR("scst_rx_data() received unknown status %x",
+		PRINT_ERROR("%s() received unknown status %x", __func__,
 			status);
 		if (!cmd->write_not_received_set)
 			scst_cmd_set_write_no_data_received(cmd);