Re: [PATCH v2 8/9] hw/sd/sdcard: Update coding style to make checkpatch.pl happy

[Alexander Bulekov]

On 200713 2032, Philippe Mathieu-Daudé wrote:
> To make the next commit easier to review, clean this code first.
> 
> Reviewed-by: Peter Maydell 
> Signed-off-by: Philippe Mathieu-Daudé 
> Reviewed-by: Alistair Francis 
> Message-Id: <20200630133912.9428-3-f4...@amsat.org>
> ---

Reviewed-by: Alexander Bulekov 

>  hw/sd/sd.c | 24 
>  1 file changed, 16 insertions(+), 8 deletions(-)
> 
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index 5ab945dade..0f048358ab 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -1175,8 +1175,9 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, 
> SDRequest req)
>  sd->data_start = addr;
>  sd->data_offset = 0;
>  
> -if (sd->data_start + sd->blk_len > sd->size)
> +if (sd->data_start + sd->blk_len > sd->size) {
>  sd->card_status |= ADDRESS_ERROR;
> +}
>  return sd_r1;
>  
>  default:
> @@ -1191,8 +1192,9 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, 
> SDRequest req)
>  sd->data_start = addr;
>  sd->data_offset = 0;
>  
> -if (sd->data_start + sd->blk_len > sd->size)
> +if (sd->data_start + sd->blk_len > sd->size) {
>  sd->card_status |= ADDRESS_ERROR;
> +}
>  return sd_r1;
>  
>  default:
> @@ -1237,12 +1239,15 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, 
> SDRequest req)
>  sd->data_offset = 0;
>  sd->blk_written = 0;
>  
> -if (sd->data_start + sd->blk_len > sd->size)
> +if (sd->data_start + sd->blk_len > sd->size) {
>  sd->card_status |= ADDRESS_ERROR;
> -if (sd_wp_addr(sd, sd->data_start))
> +}
> +if (sd_wp_addr(sd, sd->data_start)) {
>  sd->card_status |= WP_VIOLATION;
> -if (sd->csd[14] & 0x30)
> +}
> +if (sd->csd[14] & 0x30) {
>  sd->card_status |= WP_VIOLATION;
> +}
>  return sd_r1;
>  
>  default:
> @@ -1261,12 +1266,15 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, 
> SDRequest req)
>  sd->data_offset = 0;
>  sd->blk_written = 0;
>  
> -if (sd->data_start + sd->blk_len > sd->size)
> +if (sd->data_start + sd->blk_len > sd->size) {
>  sd->card_status |= ADDRESS_ERROR;
> -if (sd_wp_addr(sd, sd->data_start))
> +}
> +if (sd_wp_addr(sd, sd->data_start)) {
>  sd->card_status |= WP_VIOLATION;
> -if (sd->csd[14] & 0x30)
> +}
> +if (sd->csd[14] & 0x30) {
>  sd->card_status |= WP_VIOLATION;
> +}
>  return sd_r1;
>  
>  default:
> -- 
> 2.21.3
> 

[PATCH v2 8/9] hw/sd/sdcard: Update coding style to make checkpatch.pl happy

[Philippe Mathieu-Daudé]

To make the next commit easier to review, clean this code first.

Reviewed-by: Peter Maydell 
Signed-off-by: Philippe Mathieu-Daudé 
Reviewed-by: Alistair Francis 
Message-Id: <20200630133912.9428-3-f4...@amsat.org>
---
 hw/sd/sd.c | 24 
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 5ab945dade..0f048358ab 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -1175,8 +1175,9 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, 
SDRequest req)
 sd->data_start = addr;
 sd->data_offset = 0;
 
-if (sd->data_start + sd->blk_len > sd->size)
+if (sd->data_start + sd->blk_len > sd->size) {
 sd->card_status |= ADDRESS_ERROR;
+}
 return sd_r1;
 
 default:
@@ -1191,8 +1192,9 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, 
SDRequest req)
 sd->data_start = addr;
 sd->data_offset = 0;
 
-if (sd->data_start + sd->blk_len > sd->size)
+if (sd->data_start + sd->blk_len > sd->size) {
 sd->card_status |= ADDRESS_ERROR;
+}
 return sd_r1;
 
 default:
@@ -1237,12 +1239,15 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, 
SDRequest req)
 sd->data_offset = 0;
 sd->blk_written = 0;
 
-if (sd->data_start + sd->blk_len > sd->size)
+if (sd->data_start + sd->blk_len > sd->size) {
 sd->card_status |= ADDRESS_ERROR;
-if (sd_wp_addr(sd, sd->data_start))
+}
+if (sd_wp_addr(sd, sd->data_start)) {
 sd->card_status |= WP_VIOLATION;
-if (sd->csd[14] & 0x30)
+}
+if (sd->csd[14] & 0x30) {
 sd->card_status |= WP_VIOLATION;
+}
 return sd_r1;
 
 default:
@@ -1261,12 +1266,15 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, 
SDRequest req)
 sd->data_offset = 0;
 sd->blk_written = 0;
 
-if (sd->data_start + sd->blk_len > sd->size)
+if (sd->data_start + sd->blk_len > sd->size) {
 sd->card_status |= ADDRESS_ERROR;
-if (sd_wp_addr(sd, sd->data_start))
+}
+if (sd_wp_addr(sd, sd->data_start)) {
 sd->card_status |= WP_VIOLATION;
-if (sd->csd[14] & 0x30)
+}
+if (sd->csd[14] & 0x30) {
 sd->card_status |= WP_VIOLATION;
+}
 return sd_r1;
 
 default:
-- 
2.21.3