Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Oscar Carter <oscar.carter@gmx.com>
To:     Forest Bond <forest@alittletooquiet.net>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc:     Malcolm Priestley <tvboxspy@gmail.com>,
        Oscar Carter <oscar.carter@gmx.com>,
        Amir Mahdi Ghorbanian <indigoomega021@gmail.com>,
        Quentin Deslandes <quentin.deslandes@itdev.co.uk>,
        devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2] staging: vt6656: Use DIV_ROUND_UP macro instead of specific code
Date:   Thu, 26 Mar 2020 18:59:02 +0100
Message-Id: <20200326175902.14467-1-oscar.carter@gmx.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Use DIV_ROUND_UP macro instead of specific code with the same purpose.
Also, remove the unused variables.

Signed-off-by: Oscar Carter <oscar.carter@gmx.com>
=2D--
Changelog v1 -> v2
- Rebase the original patch [1] against the staging-next branch of the gre=
g's
  staging.git tree.

  [1] https://lore.kernel.org/lkml/20200322112342.9040-1-oscar.carter@gmx.=
com/

 drivers/staging/vt6656/baseband.c | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/ba=
seband.c
index 0b5729abcbcd..a19a563d8bcc 100644
=2D-- a/drivers/staging/vt6656/baseband.c
+++ b/drivers/staging/vt6656/baseband.c
@@ -23,6 +23,7 @@
  */

 #include <linux/bits.h>
+#include <linux/kernel.h>
 #include "mac.h"
 #include "baseband.h"
 #include "rf.h"
@@ -133,7 +134,6 @@ unsigned int vnt_get_frame_time(u8 preamble_type, u8 p=
kt_type,
 {
 	unsigned int frame_time;
 	unsigned int preamble;
-	unsigned int tmp;
 	unsigned int rate =3D 0;

 	if (tx_rate > RATE_54M)
@@ -147,20 +147,11 @@ unsigned int vnt_get_frame_time(u8 preamble_type, u8=
 pkt_type,
 		else
 			preamble =3D 192;

-		frame_time =3D (frame_length * 80) / rate;
-		tmp =3D (frame_time * rate) / 80;
-
-		if (frame_length !=3D tmp)
-			frame_time++;
-
+		frame_time =3D DIV_ROUND_UP(frame_length * 80, rate);
 		return preamble + frame_time;
 	}
-	frame_time =3D (frame_length * 8 + 22) / rate;
-	tmp =3D ((frame_time * rate) - 22) / 8;
-
-	if (frame_length !=3D tmp)
-		frame_time++;

+	frame_time =3D DIV_ROUND_UP(frame_length * 8 + 22, rate);
 	frame_time =3D frame_time * 4;

 	if (pkt_type !=3D PK_TYPE_11A)
@@ -214,11 +205,7 @@ void vnt_get_phy_field(struct vnt_private *priv, u32 =
frame_length,

 		break;
 	case RATE_5M:
-		count =3D (bit_count * 10) / 55;
-		tmp =3D (count * 55) / 10;
-
-		if (tmp !=3D bit_count)
-			count++;
+		count =3D DIV_ROUND_UP(bit_count * 10, 55);

 		if (preamble_type =3D=3D 1)
 			phy->signal =3D 0x0a;
=2D-
2.20.1