Re: [SPAM] [PATCH v42 75/98] hw/sd/sdcard: Remove sd_none enum from sd_cmd_type_t

[Cédric Le Goater]

On 6/28/24 9:01 AM, Philippe Mathieu-Daudé wrote:

All handlers using the 'sd_none' enum got converted,
remove it.

Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>

Reviewed-by: Cédric Le Goater <c...@redhat.com>

Thanks,

C.

---
  include/hw/sd/sd.h | 1 -
  hw/sd/sd.c         | 7 +------
  2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h
index 29c76935a0..c1a35ab420 100644
--- a/include/hw/sd/sd.h
+++ b/include/hw/sd/sd.h
@@ -76,7 +76,6 @@ typedef enum  {
  } sd_uhs_mode_t;

typedef enum {

-    sd_none = 0,
      sd_spi,
      sd_bc,     /* broadcast -- no response */
      sd_bcr,    /* broadcast with response */
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 6a9d611429..7f93d363c7 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -526,17 +526,12 @@ static void sd_set_rca(SDState *sd, uint16_t value)
  static uint16_t sd_req_get_rca(SDState *s, SDRequest req)
  {
      switch (s->proto->cmd[req.cmd].type) {
-    case sd_none:
-        /* Called from legacy code not ported to SDProto array */
-        assert(!s->proto->cmd[req.cmd].handler);
-        /* fall-through */
      case sd_ac:
      case sd_adtc:
          return req.arg >> 16;
      case sd_spi:
-        g_assert_not_reached();
      default:
-        return 0;
+        g_assert_not_reached();
      }
  }