Re: [PATCH 05/29] ata: Avoid comma separated statements

2021-01-31 Thread Jens Axboe
On 1/30/21 11:56 AM, Joe Perches wrote:
> On Mon, 2020-08-24 at 21:56 -0700, Joe Perches wrote:
>> Use semicolons and braces.
> 
> ping?

Queued for 5.12.

-- 
Jens Axboe



Re: [PATCH 05/29] ata: Avoid comma separated statements

2021-01-30 Thread Joe Perches
On Mon, 2020-08-24 at 21:56 -0700, Joe Perches wrote:
> Use semicolons and braces.

ping?
 
> Signed-off-by: Joe Perches 
> ---
>  drivers/ata/pata_icside.c | 21 +
>  1 file changed, 13 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/ata/pata_icside.c b/drivers/ata/pata_icside.c
> index 08543aeb0093..498383cb6e29 100644
> --- a/drivers/ata/pata_icside.c
> +++ b/drivers/ata/pata_icside.c
> @@ -202,14 +202,19 @@ static void pata_icside_set_dmamode(struct ata_port 
> *ap, struct ata_device *adev
>    * Choose the IOMD cycle timing which ensure that the interface
>    * satisfies the measured active, recovery and cycle times.
>    */
> - if (t.active <= 50 && t.recover <= 375 && t.cycle <= 425)
> - iomd_type = 'D', cycle = 187;
> - else if (t.active <= 125 && t.recover <= 375 && t.cycle <= 500)
> - iomd_type = 'C', cycle = 250;
> - else if (t.active <= 200 && t.recover <= 550 && t.cycle <= 750)
> - iomd_type = 'B', cycle = 437;
> - else
> - iomd_type = 'A', cycle = 562;
> + if (t.active <= 50 && t.recover <= 375 && t.cycle <= 425) {
> + iomd_type = 'D';
> + cycle = 187;
> + } else if (t.active <= 125 && t.recover <= 375 && t.cycle <= 500) {
> + iomd_type = 'C';
> + cycle = 250;
> + } else if (t.active <= 200 && t.recover <= 550 && t.cycle <= 750) {
> + iomd_type = 'B';
> + cycle = 437;
> + } else {
> + iomd_type = 'A';
> + cycle = 562;
> + }
>  
> 
>   ata_dev_info(adev, "timings: act %dns rec %dns cyc %dns (%c)\n",
>    t.active, t.recover, t.cycle, iomd_type);




[PATCH 05/29] ata: Avoid comma separated statements

2020-08-24 Thread Joe Perches
Use semicolons and braces.

Signed-off-by: Joe Perches 
---
 drivers/ata/pata_icside.c | 21 +
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/drivers/ata/pata_icside.c b/drivers/ata/pata_icside.c
index 08543aeb0093..498383cb6e29 100644
--- a/drivers/ata/pata_icside.c
+++ b/drivers/ata/pata_icside.c
@@ -202,14 +202,19 @@ static void pata_icside_set_dmamode(struct ata_port *ap, 
struct ata_device *adev
 * Choose the IOMD cycle timing which ensure that the interface
 * satisfies the measured active, recovery and cycle times.
 */
-   if (t.active <= 50 && t.recover <= 375 && t.cycle <= 425)
-   iomd_type = 'D', cycle = 187;
-   else if (t.active <= 125 && t.recover <= 375 && t.cycle <= 500)
-   iomd_type = 'C', cycle = 250;
-   else if (t.active <= 200 && t.recover <= 550 && t.cycle <= 750)
-   iomd_type = 'B', cycle = 437;
-   else
-   iomd_type = 'A', cycle = 562;
+   if (t.active <= 50 && t.recover <= 375 && t.cycle <= 425) {
+   iomd_type = 'D';
+   cycle = 187;
+   } else if (t.active <= 125 && t.recover <= 375 && t.cycle <= 500) {
+   iomd_type = 'C';
+   cycle = 250;
+   } else if (t.active <= 200 && t.recover <= 550 && t.cycle <= 750) {
+   iomd_type = 'B';
+   cycle = 437;
+   } else {
+   iomd_type = 'A';
+   cycle = 562;
+   }
 
ata_dev_info(adev, "timings: act %dns rec %dns cyc %dns (%c)\n",
 t.active, t.recover, t.cycle, iomd_type);
-- 
2.26.0