diff --git a/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c b/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c
index bea03c577..045d57cd9 100644
--- a/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c
+++ b/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c
@@ -1322,8 +1322,7 @@ static int sqa_init_scst_tgt(struct scsi_qla_host *vha)
 #else
 	sqa_tgt->tag_num = tag_num;
 	sqa_tgt->tgt_tag_pool = kzalloc(BITS_TO_LONGS(tag_num), GFP_KERNEL);
-	res = IS_ERR(sqa_tgt->tgt_tag_pool) ? PTR_ERR(sqa_tgt->tgt_tag_pool) :
-		0;
+	res = PTR_ERR_OR_ZERO(sqa_tgt->tgt_tag_pool);
 #endif
 	if (res < 0) {
 		pr_err("Unable to init se_sess->tgt_tag_pool, tag_num: %u\n",
diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c
index 47811242e..85a3931e0 100644
--- a/scst/src/dev_handlers/scst_vdisk.c
+++ b/scst/src/dev_handlers/scst_vdisk.c
@@ -544,10 +544,10 @@ static void vdisk_check_tp_support(struct scst_vdisk_dev *virt_dev)
 	if (virt_dev->blockio) {
 		bdev = blkdev_get_by_path(virt_dev->filename, FMODE_READ,
 					  (void *)__func__);
-		res = IS_ERR(bdev) ? PTR_ERR(bdev) : 0;
+		res = PTR_ERR_OR_ZERO(bdev);
 	} else {
 		fd = filp_open(virt_dev->filename, O_LARGEFILE, 0600);
-		res = IS_ERR(fd) ? PTR_ERR(fd) : 0;
+		res = PTR_ERR_OR_ZERO(fd);
 	}
 	if (res) {
 		if (res == -EMEDIUMTYPE && virt_dev->blockio)
@@ -1312,11 +1312,11 @@ static int vdisk_open_fd(struct scst_vdisk_dev *virt_dev, bool read_only)
 			virt_dev->bdev_mode |= FMODE_WRITE;
 		virt_dev->bdev = blkdev_get_by_path(virt_dev->filename,
 					virt_dev->bdev_mode, (void *)__func__);
-		res = IS_ERR(virt_dev->bdev) ? PTR_ERR(virt_dev->bdev) : 0;
+		res = PTR_ERR_OR_ZERO(virt_dev->bdev);
 	} else {
 		virt_dev->fd = vdev_open_fd(virt_dev, virt_dev->filename,
 					    read_only);
-		res = IS_ERR(virt_dev->fd) ? PTR_ERR(virt_dev->fd) : 0;
+		res = PTR_ERR_OR_ZERO(virt_dev->fd);
 	}
 	if (res) {
 		virt_dev->bdev = NULL;