Commit dbf798da authored by Jérôme Pouiller's avatar Jérôme Pouiller Committed by Greg Kroah-Hartman

staging: wfx: use IS_ALIGNED()

It "IS_ALIGNED(ptr, 4)" is more explicit than "ptr & 3".
Signed-off-by: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20220113085524.1110708-9-Jerome.Pouiller@silabs.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 14315552
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/align.h>
#include "bus.h" #include "bus.h"
#include "wfx.h" #include "wfx.h"
...@@ -40,8 +41,8 @@ static int wfx_sdio_copy_from_io(void *priv, unsigned int reg_id, ...@@ -40,8 +41,8 @@ static int wfx_sdio_copy_from_io(void *priv, unsigned int reg_id,
int ret; int ret;
WARN(reg_id > 7, "chip only has 7 registers"); WARN(reg_id > 7, "chip only has 7 registers");
WARN(((uintptr_t)dst) & 3, "unaligned buffer size"); WARN(!IS_ALIGNED((uintptr_t)dst, 4), "unaligned buffer address");
WARN(count & 3, "unaligned buffer address"); WARN(!IS_ALIGNED(count, 4), "unaligned buffer size");
/* Use queue mode buffers */ /* Use queue mode buffers */
if (reg_id == WFX_REG_IN_OUT_QUEUE) if (reg_id == WFX_REG_IN_OUT_QUEUE)
...@@ -61,8 +62,8 @@ static int wfx_sdio_copy_to_io(void *priv, unsigned int reg_id, ...@@ -61,8 +62,8 @@ static int wfx_sdio_copy_to_io(void *priv, unsigned int reg_id,
int ret; int ret;
WARN(reg_id > 7, "chip only has 7 registers"); WARN(reg_id > 7, "chip only has 7 registers");
WARN(((uintptr_t)src) & 3, "unaligned buffer size"); WARN(!IS_ALIGNED((uintptr_t)src, 4), "unaligned buffer address");
WARN(count & 3, "unaligned buffer address"); WARN(!IS_ALIGNED(count, 4), "unaligned buffer size");
/* Use queue mode buffers */ /* Use queue mode buffers */
if (reg_id == WFX_REG_IN_OUT_QUEUE) if (reg_id == WFX_REG_IN_OUT_QUEUE)
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/align.h>
#include "hwio.h" #include "hwio.h"
#include "wfx.h" #include "wfx.h"
...@@ -221,7 +222,7 @@ int wfx_data_read(struct wfx_dev *wdev, void *buf, size_t len) ...@@ -221,7 +222,7 @@ int wfx_data_read(struct wfx_dev *wdev, void *buf, size_t len)
{ {
int ret; int ret;
WARN((long)buf & 3, "%s: unaligned buffer", __func__); WARN(!IS_ALIGNED((uintptr_t)buf, 4), "unaligned buffer");
wdev->hwbus_ops->lock(wdev->hwbus_priv); wdev->hwbus_ops->lock(wdev->hwbus_priv);
ret = wdev->hwbus_ops->copy_from_io(wdev->hwbus_priv, ret = wdev->hwbus_ops->copy_from_io(wdev->hwbus_priv,
WFX_REG_IN_OUT_QUEUE, buf, len); WFX_REG_IN_OUT_QUEUE, buf, len);
...@@ -237,7 +238,7 @@ int wfx_data_write(struct wfx_dev *wdev, const void *buf, size_t len) ...@@ -237,7 +238,7 @@ int wfx_data_write(struct wfx_dev *wdev, const void *buf, size_t len)
{ {
int ret; int ret;
WARN((long)buf & 3, "%s: unaligned buffer", __func__); WARN(!IS_ALIGNED((uintptr_t)buf, 4), "unaligned buffer");
wdev->hwbus_ops->lock(wdev->hwbus_priv); wdev->hwbus_ops->lock(wdev->hwbus_priv);
ret = wdev->hwbus_ops->copy_to_io(wdev->hwbus_priv, ret = wdev->hwbus_ops->copy_to_io(wdev->hwbus_priv,
WFX_REG_IN_OUT_QUEUE, buf, len); WFX_REG_IN_OUT_QUEUE, buf, len);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment