]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
mmc: bcm2835: Use str_read_write() helper
authorYumeng Fang <fang.yumeng@zte.com.cn>
Thu, 15 May 2025 12:42:01 +0000 (20:42 +0800)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 19 May 2025 12:00:50 +0000 (14:00 +0200)
Remove hard-coded strings by using the str_read_write() helper.

Signed-off-by: Yumeng Fang <fang.yumeng@zte.com.cn>
Link: https://lore.kernel.org/r/20250515204201502Kzmj4I6k5Fv2FjqyEjF6n@zte.com.cn
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/bcm2835.c

index e5f151d092cd31ae4aea156f1893dd674a57297c..def054ddd2562819c5db0c343695ed3ee2185cc9 100644 (file)
@@ -44,6 +44,7 @@
 #include <linux/scatterlist.h>
 #include <linux/time.h>
 #include <linux/workqueue.h>
+#include <linux/string_choices.h>
 
 #include <linux/mmc/host.h>
 #include <linux/mmc/mmc.h>
@@ -391,8 +392,7 @@ static void bcm2835_transfer_block_pio(struct bcm2835_host *host, bool is_read)
 
                                if (time_after(jiffies, wait_max)) {
                                        dev_err(dev, "PIO %s timeout - EDM %08x\n",
-                                               is_read ? "read" : "write",
-                                               edm);
+                                               str_read_write(is_read), edm);
                                        hsts = SDHSTS_REW_TIME_OUT;
                                        break;
                                }
@@ -435,12 +435,12 @@ static void bcm2835_transfer_pio(struct bcm2835_host *host)
                      SDHSTS_CRC7_ERROR |
                      SDHSTS_FIFO_ERROR)) {
                dev_err(dev, "%s transfer error - HSTS %08x\n",
-                       is_read ? "read" : "write", sdhsts);
+                       str_read_write(is_read), sdhsts);
                host->data->error = -EILSEQ;
        } else if ((sdhsts & (SDHSTS_CMD_TIME_OUT |
                              SDHSTS_REW_TIME_OUT))) {
                dev_err(dev, "%s timeout error - HSTS %08x\n",
-                       is_read ? "read" : "write", sdhsts);
+                       str_read_write(is_read), sdhsts);
                host->data->error = -ETIMEDOUT;
        }
 }