scsi: sd: Use string_choices to fix Coccinelle warnings

[PATCH] scsi: sd: Use string_choices to fix Coccinelle warnings

Posted by Nick Spooner 1 month, 3 weeks ago

Fixes the following Coccinelle warnings reported by string_choices.cocci:

	opportunity for str_enabled_disabled(sdkp -> WCE)
	opportunity for str_on_off(sdkp -> write_prot)

Signed-off-by: Nick Spooner <nicholas.spooner@seagate.com>
---
 drivers/scsi/sd.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index adc3fa55ca2c..dd284647ed64 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -50,6 +50,7 @@
 #include <linux/rw_hint.h>
 #include <linux/major.h>
 #include <linux/mutex.h>
+#include <linux/string_choices.h>
 #include <linux/string_helpers.h>
 #include <linux/slab.h>
 #include <linux/sed-opal.h>
@@ -3084,7 +3085,7 @@ sd_read_write_protect_flag(struct scsi_disk *sdkp, unsigned char *buffer)
 		set_disk_ro(sdkp->disk, sdkp->write_prot);
 		if (sdkp->first_scan || old_wp != sdkp->write_prot) {
 			sd_printk(KERN_NOTICE, sdkp, "Write Protect is %s\n",
-				  sdkp->write_prot ? "on" : "off");
+				  str_on_off(sdkp->write_prot));
 			sd_printk(KERN_DEBUG, sdkp, "Mode Sense: %4ph\n", buffer);
 		}
 	}
@@ -3235,8 +3236,8 @@ sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer)
 		    old_rcd != sdkp->RCD || old_dpofua != sdkp->DPOFUA)
 			sd_printk(KERN_NOTICE, sdkp,
 				  "Write cache: %s, read cache: %s, %s\n",
-				  sdkp->WCE ? "enabled" : "disabled",
-				  sdkp->RCD ? "disabled" : "enabled",
+				  str_enabled_disabled(sdkp->WCE),
+				  str_disabled_enabled(sdkp->RCD),
 				  sdkp->DPOFUA ? "supports DPO and FUA"
 				  : "doesn't support DPO or FUA");
 
-- 
2.53.0

Re: [PATCH] scsi: sd: Use string_choices to fix Coccinelle warnings

Posted by Bart Van Assche 1 month, 3 weeks ago

On 4/23/26 2:16 PM, Nick Spooner wrote:
> diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
> index adc3fa55ca2c..dd284647ed64 100644
> --- a/drivers/scsi/sd.c
> +++ b/drivers/scsi/sd.c
> @@ -50,6 +50,7 @@
>   #include <linux/rw_hint.h>
>   #include <linux/major.h>
>   #include <linux/mutex.h>
> +#include <linux/string_choices.h>
>   #include <linux/string_helpers.h>
>   #include <linux/slab.h>
>   #include <linux/sed-opal.h>
> @@ -3084,7 +3085,7 @@ sd_read_write_protect_flag(struct scsi_disk *sdkp, unsigned char *buffer)
>   		set_disk_ro(sdkp->disk, sdkp->write_prot);
>   		if (sdkp->first_scan || old_wp != sdkp->write_prot) {
>   			sd_printk(KERN_NOTICE, sdkp, "Write Protect is %s\n",
> -				  sdkp->write_prot ? "on" : "off");
> +				  str_on_off(sdkp->write_prot));
>   			sd_printk(KERN_DEBUG, sdkp, "Mode Sense: %4ph\n", buffer);
>   		}
>   	}
> @@ -3235,8 +3236,8 @@ sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer)
>   		    old_rcd != sdkp->RCD || old_dpofua != sdkp->DPOFUA)
>   			sd_printk(KERN_NOTICE, sdkp,
>   				  "Write cache: %s, read cache: %s, %s\n",
> -				  sdkp->WCE ? "enabled" : "disabled",
> -				  sdkp->RCD ? "disabled" : "enabled",
> +				  str_enabled_disabled(sdkp->WCE),
> +				  str_disabled_enabled(sdkp->RCD),
>   				  sdkp->DPOFUA ? "supports DPO and FUA"
>   				  : "doesn't support DPO or FUA");

My opinion is that the sd code is easier to read *without* this patch. 
But that's just my opinion. Maybe there are other opinions.

Bart.

Re: [PATCH] scsi: sd: Use string_choices to fix Coccinelle warnings

Posted by Martin K. Petersen 1 month, 3 weeks ago

Bart,

> My opinion is that the sd code is easier to read *without* this patch.

Yep, I agree.

-- 
Martin K. Petersen