diff mbox series

mmc: bcm2835: Use str_read_write() helper

Message ID 20250515204201502Kzmj4I6k5Fv2FjqyEjF6n@zte.com.cn
State New
Headers show
Series mmc: bcm2835: Use str_read_write() helper | expand

Commit Message

long.yunjian@zte.com.cn May 15, 2025, 12:42 p.m. UTC 
From: Yumeng Fang <fang.yumeng@zte.com.cn>

Remove hard-coded strings by using the str_read_write() helper.

Signed-off-by: Yumeng Fang <fang.yumeng@zte.com.cn>
---
 drivers/mmc/host/bcm2835.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Ulf Hansson May 19, 2025, 12:31 p.m. UTC | #1 
On Thu, 15 May 2025 at 14:42, <long.yunjian@zte.com.cn> wrote:
>
> From: Yumeng Fang <fang.yumeng@zte.com.cn>
>
> Remove hard-coded strings by using the str_read_write() helper.
>
> Signed-off-by: Yumeng Fang <fang.yumeng@zte.com.cn>

Applied for next, thanks!

Kind regards
Uffe


> ---
>  drivers/mmc/host/bcm2835.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c
> index e5f151d092cd..def054ddd256 100644
> --- a/drivers/mmc/host/bcm2835.c
> +++ b/drivers/mmc/host/bcm2835.c
> @@ -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;
>         }
>  }
> --
> 2.25.1
diff mbox series

Patch

diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c
index e5f151d092cd..def054ddd256 100644
--- a/drivers/mmc/host/bcm2835.c
+++ b/drivers/mmc/host/bcm2835.c
@@ -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;
 	}
 }