[PATCH v2 6/6] staging: vt6655: Remove macro PCAvDelayByIO

From: Philipp Hortmann
Date: Mon Apr 04 2022 - 18:09:02 EST


Remove do-while(0) and CamelCase macro PCAvDelayByIO as
it is not accepted by checkpatch.pl
As the macro is just used once with a constant <= 50 the
functionality of the macro is implemented by using
udelay() directly.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@xxxxxxxxx>
---
V1 -> V2: Changed converting macro to function to delete macro
This patch was 7/7 and is now 6/6
---
drivers/staging/vt6655/srom.c | 2 +-
drivers/staging/vt6655/upc.h | 13 -------------
2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/drivers/staging/vt6655/srom.c b/drivers/staging/vt6655/srom.c
index 1612c9702e31..2719046f1ac0 100644
--- a/drivers/staging/vt6655/srom.c
+++ b/drivers/staging/vt6655/srom.c
@@ -80,7 +80,7 @@ unsigned char SROMbyReadEmbedded(void __iomem *iobase,
VNS_IN_PORTB(iobase + MAC_REG_I2MCSR, &byWait);
if (byWait & (I2MCSR_DONE | I2MCSR_NACK))
break;
- PCAvDelayByIO(CB_DELAY_LOOP_WAIT);
+ udelay(CB_DELAY_LOOP_WAIT);
}
if ((wDelay < W_MAX_TIMEOUT) &&
(!(byWait & I2MCSR_NACK))) {
diff --git a/drivers/staging/vt6655/upc.h b/drivers/staging/vt6655/upc.h
index 7d5075ec3162..05e0cf2e7d97 100644
--- a/drivers/staging/vt6655/upc.h
+++ b/drivers/staging/vt6655/upc.h
@@ -38,19 +38,6 @@
#define VNS_OUT_PORTD(io_address, data) \
iowrite32((u32)(data), io_address)

-#define PCAvDelayByIO(u_delay_unit) \
-do { \
- unsigned char __maybe_unused data; \
- unsigned long ii; \
- \
- if (u_delay_unit <= 50) { \
- udelay(u_delay_unit); \
- } else { \
- for (ii = 0; ii < (u_delay_unit); ii++) \
- data = inb(0x61); \
- } \
-} while (0)
-
/*--------------------- Export Classes ----------------------------*/

/*--------------------- Export Variables --------------------------*/
--
2.25.1