diff --git a/common/cmd_sf.c b/common/cmd_sf.c
index c715d0f..122a2e1 100644
--- a/common/cmd_sf.c
+++ b/common/cmd_sf.c
@@ -165,8 +165,6 @@
 		ret = spi_flash_protect(flash, 1);
 	if (strcmp(cmd, "off") == 0)
 		ret = spi_flash_protect(flash, 0);
-	if (strcmp(cmd, "all_off") == 0)
-		ret = spi_flash_protect(flash, -1);
 	if (ret) {
 		printf("SPI flash %s failed\n", argv[0]);
 		return 1;
@@ -175,7 +173,7 @@
 	return 0;
 
 usage:
-	puts("Usage: sf protect on/off/all_off\n");
+	puts("Usage: sf protect on/off\n");
 	return 1;
 }
 
diff --git a/drivers/mtd/spi/macronix.c b/drivers/mtd/spi/macronix.c
index a78b957..f3d7bb8 100644
--- a/drivers/mtd/spi/macronix.c
+++ b/drivers/mtd/spi/macronix.c
@@ -397,17 +397,10 @@
 
 	cmd[0] = CMD_MX25XX_WRSR;
 
-	switch(enable) {
-	case 1:
+	if (enable == 1)
 		cmd[1] = MX_SRWD | MX_PROTECT_ALL;
-		break;
-	case 0:
-		cmd[1] = MX_SRWD;
-		break;
-	default:
-	case -1:
+	else
 		cmd[1] = 0;
-	}
 
 	ret = spi_flash_cmd(flash->spi, CMD_MX25XX_WREN, NULL, 0);
 	if (ret < 0) {
diff --git a/drivers/mtd/spi/stmicro.c b/drivers/mtd/spi/stmicro.c
index ac1f1b3..eae5e94 100644
--- a/drivers/mtd/spi/stmicro.c
+++ b/drivers/mtd/spi/stmicro.c
@@ -428,17 +428,10 @@
 
 	cmd[0] = CMD_M25PXX_WRSR;
 
-	switch(enable) {
-	case 1:
+	if (enable == 1)
 		cmd[1] = STM_SRWD | STM_PROTECT_ALL;
-		break;
-	case 0:
-		cmd[1] = STM_SRWD;
-		break;
-	default:
-	case -1:
+	else
 		cmd[1] = 0;
-	}
 
 	ret = spi_flash_cmd(flash->spi, CMD_M25PXX_WREN, NULL, 0);
 	if (ret < 0) {