[Qemu-devel] [PATCH] hw/sd/sd.c: Drop unused sd_acmd_type[] array

[Qemu-devel] [PATCH] hw/sd/sd.c: Drop unused sd_acmd_type[] array

[Peter Maydell]

Drop the sd_acmd_type[] array: it is never used. (The equivalent
sd_cmd_type[] array for normal commands is used to identify
those commands whose argument includes the card address in the
top 16 bits; but for app commands the card address is passed
with the APP_CMD prefix, not with the argument to the app command
itself.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
clang 3.4 warns about this unused variable. If we ever turn out to
need the information it's all in the sd card spec anyway.

 hw/sd/sd.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 4502ad1..5efe8c1 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -151,17 +151,6 @@ static const sd_cmd_type_t sd_cmd_type[64] = {
     sd_adtc, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none,
 };
 
-static const sd_cmd_type_t sd_acmd_type[64] = {
-    sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_ac,   sd_none,
-    sd_none, sd_none, sd_none, sd_none, sd_none, sd_adtc, sd_none, sd_none,
-    sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_adtc, sd_ac,
-    sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none,
-    sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none,
-    sd_none, sd_bcr,  sd_ac,   sd_none, sd_none, sd_none, sd_none, sd_none,
-    sd_none, sd_none, sd_none, sd_adtc, sd_none, sd_none, sd_none, sd_none,
-    sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none,
-};
-
 static const int sd_cmd_class[64] = {
     0,  0,  0,  0,  0,  9, 10,  0,  0,  0,  0,  1,  0,  0,  0,  0,
     2,  2,  2,  2,  3,  3,  3,  3,  4,  4,  4,  4,  6,  6,  6,  6,
-- 
1.9.2

Re: [Qemu-devel] [PATCH] hw/sd/sd.c: Drop unused sd_acmd_type[] array

[Peter Crosthwaite]

On Wed, Jun 4, 2014 at 3:29 AM, Peter Maydell <peter.maydell@linaro.org> wrote:
> Drop the sd_acmd_type[] array: it is never used. (The equivalent
> sd_cmd_type[] array for normal commands is used to identify
> those commands whose argument includes the card address in the
> top 16 bits; but for app commands the card address is passed
> with the APP_CMD prefix, not with the argument to the app command
> itself.)
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>

> ---
> clang 3.4 warns about this unused variable. If we ever turn out to
> need the information it's all in the sd card spec anyway.
>
>  hw/sd/sd.c | 11 -----------
>  1 file changed, 11 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index 4502ad1..5efe8c1 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -151,17 +151,6 @@ static const sd_cmd_type_t sd_cmd_type[64] = {
>      sd_adtc, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none,
>  };
>
> -static const sd_cmd_type_t sd_acmd_type[64] = {
> -    sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_ac,   sd_none,
> -    sd_none, sd_none, sd_none, sd_none, sd_none, sd_adtc, sd_none, sd_none,
> -    sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_adtc, sd_ac,
> -    sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none,
> -    sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none,
> -    sd_none, sd_bcr,  sd_ac,   sd_none, sd_none, sd_none, sd_none, sd_none,
> -    sd_none, sd_none, sd_none, sd_adtc, sd_none, sd_none, sd_none, sd_none,
> -    sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none,
> -};
> -
>  static const int sd_cmd_class[64] = {
>      0,  0,  0,  0,  0,  9, 10,  0,  0,  0,  0,  1,  0,  0,  0,  0,
>      2,  2,  2,  2,  3,  3,  3,  3,  4,  4,  4,  4,  6,  6,  6,  6,
> --
> 1.9.2
>
>

Re: [Qemu-devel] [Qemu-trivial] [PATCH] hw/sd/sd.c: Drop unused sd_acmd_type[] array

[Michael Tokarev]

Applied to -trivial, thank you!

/mjt