From: Nick Spooner <nicholas.spooner@seagate.com>
To: James.Bottomley@HansenPartnership.com, martin.petersen@oracle.com
Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
Nick Spooner <nicholas.spooner@seagate.com>
Subject: [PATCH] scsi: sd: Use string_choices to fix Coccinelle warnings
Date: Thu, 23 Apr 2026 15:16:44 -0600 [thread overview]
Message-ID: <20260423211644.3481898-1-nicholas.spooner@seagate.com> (raw)
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
next reply other threads:[~2026-04-23 21:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-23 21:16 Nick Spooner [this message]
2026-04-23 23:55 ` [PATCH] scsi: sd: Use string_choices to fix Coccinelle warnings Bart Van Assche
2026-04-27 1:35 ` Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260423211644.3481898-1-nicholas.spooner@seagate.com \
--to=nicholas.spooner@seagate.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox