diff --git a/drivers/block/ide.c b/drivers/block/ide.c
index a51a000..6c5227a 100644
--- a/drivers/block/ide.c
+++ b/drivers/block/ide.c
@@ -465,8 +465,6 @@
 	return n;
 }
 
-#ifdef CONFIG_ATAPI
-
 static void atapi_inquiry(struct blk_desc *dev_desc)
 {
 	unsigned char ccb[12];	/* Command descriptor block */
@@ -549,8 +547,6 @@
 	return;
 }
 
-#endif /* CONFIG_ATAPI */
-
 static void ide_ident(struct blk_desc *dev_desc)
 {
 	unsigned char c;
@@ -637,13 +633,11 @@
 	else
 		dev_desc->removable = 0;
 
-#ifdef CONFIG_ATAPI
-	if (is_atapi) {
+	if (IS_ENABLED(CONFIG_ATAPI) && is_atapi) {
 		dev_desc->atapi = true;
 		atapi_inquiry(dev_desc);
 		return;
 	}
-#endif /* CONFIG_ATAPI */
 
 	iop.lba_capacity[0] = be16_to_cpu(iop.lba_capacity[0]);
 	iop.lba_capacity[1] = be16_to_cpu(iop.lba_capacity[1]);
@@ -732,11 +726,10 @@
 		if (c & (ATA_STAT_BUSY | ATA_STAT_FAULT)) {
 			puts("not available  ");
 			debug("Status = 0x%02X ", c);
-#ifndef CONFIG_ATAPI		/* ATAPI Devices do not set DRDY */
-		} else if ((c & ATA_STAT_READY) == 0) {
+		} else if (IS_ENABLED(CONFIG_ATAPI) && !(c & ATA_STAT_READY)) {
+			/* ATAPI Devices do not set DRDY */
 			puts("not available  ");
 			debug("Status = 0x%02X ", c);
-#endif
 		} else {
 			puts("OK ");
 			ide_bus_ok[bus] = 1;