Received-SPF: pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Received-SPF: Pass (esa2.microchip.iphmx.com: domain of
  Ajay.Kathat@microchip.com designates 198.175.253.82 as
  permitted sender) identity=mailfrom;
  client-ip=198.175.253.82; receiver=esa2.microchip.iphmx.com;
  envelope-from="Ajay.Kathat@microchip.com";
  x-sender="Ajay.Kathat@microchip.com"; x-conformance=spf_only;
  x-record-type="v=spf1"; x-record-text="v=spf1 mx
  a:ushub1.microchip.com a:smtpout.microchip.com
  -exists:%{i}.spf.microchip.iphmx.com include:servers.mcsv.net
  include:mktomail.com include:spf.protection.outlook.com ~all"
Received-SPF: None (esa2.microchip.iphmx.com: no sender
  authenticity information available from domain of
  postmaster@email.microchip.com) identity=helo;
  client-ip=198.175.253.82; receiver=esa2.microchip.iphmx.com;
  envelope-from="Ajay.Kathat@microchip.com";
  x-sender="postmaster@email.microchip.com";
  x-conformance=spf_only
IronPort-SDR: 3L+dZ3C5tl2s9MBSYm3YU8Nj+bUbyzzWQ11HsEGZdp6N9x0uWltgMfmjG/0lmxPlIz2WYy/oEY
 eXB7ZQA8DleC36v7NV2kygMpqQTn8w5jsC1EaAoCnOyC8YrzFqKTC/VkSMkeAm8uMnS/qKlsFy
 EDa5l8EuX/8B7295aM9lZGldrQFQAgQc2O1rD/9+9N1XbGcAlM7WSftGwWVE2oqdX7Dm8NYo7C
 KeREkv3fmuSppEX6MJ7E2JDdWA3EGaf0SRBVdi1/s0n5k9kLYOXUU1uFE8lOxywCwTCE2Hpznz
 4OQ=
From:   <Ajay.Kathat@microchip.com>
To:     <linux-wireless@vger.kernel.org>
CC:     <devel@driverdev.osuosl.org>, <gregkh@linuxfoundation.org>,
        <Adham.Abozaeid@microchip.com>, <johannes@sipsolutions.net>,
        <Ajay.Kathat@microchip.com>
Subject: [PATCH 4/8] staging: wilc1000: make use of ALIGN macro
Thread-Topic: [PATCH 4/8] staging: wilc1000: make use of ALIGN macro
Thread-Index: AQHV4y01fyqHwhyg7Ee2FuDOZILgyA==
Date:   Fri, 14 Feb 2020 11:52:18 +0000
Message-ID: <20200214172250.13026-5-ajay.kathat@microchip.com>
References: <20200214172250.13026-1-ajay.kathat@microchip.com>
In-Reply-To: <20200214172250.13026-1-ajay.kathat@microchip.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microchip.com does not designate
 permitted sender hosts)
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 31369809-175a-45bc-2f8d-08d7b1445818
X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Feb 2020 11:52:18.8148
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: SF1LmBZuBoOivnTZAbsW+XXhU8GuQFF44TXV0o1EUzjazh048I0UMIxLIgTd2dJnKhKsPTSeWkKVpu2r/L90qGNb5iytUPIbuQU1K4/pJGk=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1652
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

From: Ajay Singh <ajay.kathat@microchip.com>

Make use of 'ALIGN' macro to align the size data value.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
---
 drivers/staging/wilc1000/sdio.c | 34 ++-------------------------------
 drivers/staging/wilc1000/wlan.c |  4 +---
 2 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/drivers/staging/wilc1000/sdio.c b/drivers/staging/wilc1000/sdi=
o.c
index 66706efc5711..212affc4b9c1 100644
--- a/drivers/staging/wilc1000/sdio.c
+++ b/drivers/staging/wilc1000/sdio.c
@@ -415,28 +415,12 @@ static int wilc_sdio_write(struct wilc *wilc, u32 add=
r, u8 *buf, u32 size)
=20
 	cmd.read_write =3D 1;
 	if (addr > 0) {
-		/**
-		 *      has to be word aligned...
-		 **/
-		if (size & 0x3) {
-			size +=3D 4;
-			size &=3D ~0x3;
-		}
-
 		/**
 		 *      func 0 access
 		 **/
 		cmd.function =3D 0;
 		cmd.address =3D 0x10f;
 	} else {
-		/**
-		 *      has to be word aligned...
-		 **/
-		if (size & 0x3) {
-			size +=3D 4;
-			size &=3D ~0x3;
-		}
-
 		/**
 		 *      func 1 access
 		 **/
@@ -444,6 +428,7 @@ static int wilc_sdio_write(struct wilc *wilc, u32 addr,=
 u8 *buf, u32 size)
 		cmd.address =3D 0;
 	}
=20
+	size =3D ALIGN(size, 4);
 	nblk =3D size / block_size;
 	nleft =3D size % block_size;
=20
@@ -551,28 +536,12 @@ static int wilc_sdio_read(struct wilc *wilc, u32 addr=
, u8 *buf, u32 size)
=20
 	cmd.read_write =3D 0;
 	if (addr > 0) {
-		/**
-		 *      has to be word aligned...
-		 **/
-		if (size & 0x3) {
-			size +=3D 4;
-			size &=3D ~0x3;
-		}
-
 		/**
 		 *      func 0 access
 		 **/
 		cmd.function =3D 0;
 		cmd.address =3D 0x10f;
 	} else {
-		/**
-		 *      has to be word aligned...
-		 **/
-		if (size & 0x3) {
-			size +=3D 4;
-			size &=3D ~0x3;
-		}
-
 		/**
 		 *      func 1 access
 		 **/
@@ -580,6 +549,7 @@ static int wilc_sdio_read(struct wilc *wilc, u32 addr, =
u8 *buf, u32 size)
 		cmd.address =3D 0;
 	}
=20
+	size =3D ALIGN(size, 4);
 	nblk =3D size / block_size;
 	nleft =3D size % block_size;
=20
diff --git a/drivers/staging/wilc1000/wlan.c b/drivers/staging/wilc1000/wla=
n.c
index 9dfabd1af4e7..db4ef175ccee 100644
--- a/drivers/staging/wilc1000/wlan.c
+++ b/drivers/staging/wilc1000/wlan.c
@@ -508,9 +508,7 @@ int wilc_wlan_handle_txq(struct wilc *wilc, u32 *txq_co=
unt)
 			vmm_sz =3D HOST_HDR_OFFSET;
=20
 		vmm_sz +=3D tqe->buffer_size;
-
-		if (vmm_sz & 0x3)
-			vmm_sz =3D (vmm_sz + 4) & ~0x3;
+		vmm_sz =3D ALIGN(vmm_sz, 4);
=20
 		if ((sum + vmm_sz) > WILC_TX_BUFF_SIZE)
 			break;
--=20
2.24.0