2020-02-21 20:31:03

by Kaaira Gupta

Subject: [PATCH] staging: qlge: add braces on all arms of if-else

fix all checkpatch.pl warnings of 'braces {} should be used on all arms
of this statement' in the file qlge_ethtool.c by adding the braces.

Signed-off-by: Kaaira Gupta <[email protected]>
---
drivers/staging/qlge/qlge_ethtool.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/qlge/qlge_ethtool.c b/drivers/staging/qlge/qlge_ethtool.c
index 790997aff995..592ca7edfc44 100644
--- a/drivers/staging/qlge/qlge_ethtool.c
+++ b/drivers/staging/qlge/qlge_ethtool.c
@@ -259,8 +259,9 @@ static void ql_update_stats(struct ql_adapter *qdev)
"Error reading status register 0x%.04x.\n",
i);
goto end;
- } else
+ } else {
*iter = data;
+ }
iter++;
}

@@ -273,8 +274,9 @@ static void ql_update_stats(struct ql_adapter *qdev)
"Error reading status register 0x%.04x.\n",
i);
goto end;
- } else
+ } else {
*iter = data;
+ }
iter++;
}

@@ -290,8 +292,9 @@ static void ql_update_stats(struct ql_adapter *qdev)
"Error reading status register 0x%.04x.\n",
i);
goto end;
- } else
+ } else {
*iter = data;
+ }
iter++;
}

@@ -304,8 +307,9 @@ static void ql_update_stats(struct ql_adapter *qdev)
"Error reading status register 0x%.04x.\n",
i);
goto end;
- } else
+ } else {
*iter = data;
+ }
iter++;
}

@@ -316,8 +320,9 @@ static void ql_update_stats(struct ql_adapter *qdev)
netif_err(qdev, drv, qdev->ndev,
"Error reading status register 0x%.04x.\n", i);
goto end;
- } else
+ } else {
*iter = data;
+ }
end:
ql_sem_unlock(qdev, qdev->xg_sem_mask);
quit:
@@ -488,8 +493,9 @@ static int ql_start_loopback(struct ql_adapter *qdev)
if (netif_carrier_ok(qdev->ndev)) {
set_bit(QL_LB_LINK_UP, &qdev->flags);
netif_carrier_off(qdev->ndev);
- } else
+ } else {
clear_bit(QL_LB_LINK_UP, &qdev->flags);
+ }
qdev->link_config |= CFG_LOOPBACK_PCS;
return ql_mb_set_port_cfg(qdev);
}
--
2.17.1

2020-02-21 20:56:19

by Gustavo A. R. Silva

Subject: Re: [PATCH] staging: qlge: add braces on all arms of if-else

On 2/21/20 14:29, Kaaira Gupta wrote:
> fix all checkpatch.pl warnings of 'braces {} should be used on all arms
> of this statement' in the file qlge_ethtool.c by adding the braces.
>
> Signed-off-by: Kaaira Gupta <[email protected]>

Acked-by: Gustavo A. R. Silva <[email protected]>

Thanks for you patch.
--
Gustavo

> ---
> drivers/staging/qlge/qlge_ethtool.c | 18 ++++++++++++------
> 1 file changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/staging/qlge/qlge_ethtool.c b/drivers/staging/qlge/qlge_ethtool.c
> index 790997aff995..592ca7edfc44 100644
> --- a/drivers/staging/qlge/qlge_ethtool.c
> +++ b/drivers/staging/qlge/qlge_ethtool.c
> @@ -259,8 +259,9 @@ static void ql_update_stats(struct ql_adapter *qdev)
> "Error reading status register 0x%.04x.\n",
> i);
> goto end;
> - } else
> + } else {
> *iter = data;
> + }
> iter++;
> }
>
> @@ -273,8 +274,9 @@ static void ql_update_stats(struct ql_adapter *qdev)
> "Error reading status register 0x%.04x.\n",
> i);
> goto end;
> - } else
> + } else {
> *iter = data;
> + }
> iter++;
> }
>
> @@ -290,8 +292,9 @@ static void ql_update_stats(struct ql_adapter *qdev)
> "Error reading status register 0x%.04x.\n",
> i);
> goto end;
> - } else
> + } else {
> *iter = data;
> + }
> iter++;
> }
>
> @@ -304,8 +307,9 @@ static void ql_update_stats(struct ql_adapter *qdev)
> "Error reading status register 0x%.04x.\n",
> i);
> goto end;
> - } else
> + } else {
> *iter = data;
> + }
> iter++;
> }
>
> @@ -316,8 +320,9 @@ static void ql_update_stats(struct ql_adapter *qdev)
> netif_err(qdev, drv, qdev->ndev,
> "Error reading status register 0x%.04x.\n", i);
> goto end;
> - } else
> + } else {
> *iter = data;
> + }
> end:
> ql_sem_unlock(qdev, qdev->xg_sem_mask);
> quit:
> @@ -488,8 +493,9 @@ static int ql_start_loopback(struct ql_adapter *qdev)
> if (netif_carrier_ok(qdev->ndev)) {
> set_bit(QL_LB_LINK_UP, &qdev->flags);
> netif_carrier_off(qdev->ndev);
> - } else
> + } else {
> clear_bit(QL_LB_LINK_UP, &qdev->flags);
> + }
> qdev->link_config |= CFG_LOOPBACK_PCS;
> return ql_mb_set_port_cfg(qdev);
> }
>