aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6655
diff options
context:
space:
mode:
authorPhilipp Hortmann <philipp.g.hortmann@gmail.com>2022-07-13 07:02:03 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-07-14 15:48:38 +0200
commit64a5c7bf563b3825b2c46d8a8c69a1c6c4029d2d (patch)
treefb8ab92db048a0af23ae61c25737dd68f9031371 /drivers/staging/vt6655
parentstaging: vt6655: Convert macro vt6655_mac_word_reg_bits_on to function (diff)
downloadlinux-dev-64a5c7bf563b3825b2c46d8a8c69a1c6c4029d2d.tar.xz
linux-dev-64a5c7bf563b3825b2c46d8a8c69a1c6c4029d2d.zip
staging: vt6655: Convert macro vt6655_mac_reg_bits_off to function
Convert macro vt6655_mac_reg_bits_off to function. checkpatch.pl does not accept multiline macros. Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> Link: https://lore.kernel.org/r/422950c8e1349fba2f97b0b95ba13f361cde05d9.1657657918.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6655')
-rw-r--r--drivers/staging/vt6655/mac.c8
-rw-r--r--drivers/staging/vt6655/mac.h8
2 files changed, 9 insertions, 7 deletions
diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c
index 076e1bfff3e0..aa9684229dfe 100644
--- a/drivers/staging/vt6655/mac.c
+++ b/drivers/staging/vt6655/mac.c
@@ -54,6 +54,14 @@ void vt6655_mac_word_reg_bits_on(void __iomem *iobase, const u8 reg_offset, cons
iowrite16(reg_value | (bit_mask), iobase + reg_offset);
}
+void vt6655_mac_reg_bits_off(void __iomem *iobase, const u8 reg_offset, const u8 bit_mask)
+{
+ unsigned char reg_value;
+
+ reg_value = ioread8(iobase + reg_offset);
+ iowrite8(reg_value & ~(bit_mask), iobase + reg_offset);
+}
+
/*
* Description:
* Test if all test bits off
diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
index 3b23334db538..e7b648cf2024 100644
--- a/drivers/staging/vt6655/mac.h
+++ b/drivers/staging/vt6655/mac.h
@@ -537,13 +537,6 @@
/*--------------------- Export Macros ------------------------------*/
-#define vt6655_mac_reg_bits_off(iobase, reg_offset, bit_mask) \
-do { \
- unsigned char reg_value; \
- reg_value = ioread8(iobase + reg_offset); \
- iowrite8(reg_value & ~(bit_mask), iobase + reg_offset); \
-} while (0)
-
#define vt6655_mac_word_reg_bits_off(iobase, reg_offset, bit_mask) \
do { \
unsigned short reg_value; \
@@ -654,6 +647,7 @@ do { \
void vt6655_mac_reg_bits_on(void __iomem *iobase, const u8 reg_offset, const u8 bit_mask);
void vt6655_mac_word_reg_bits_on(void __iomem *iobase, const u8 reg_offset, const u16 bit_mask);
+void vt6655_mac_reg_bits_off(void __iomem *iobase, const u8 reg_offset, const u8 bit_mask);
bool MACbIsRegBitsOff(struct vnt_private *priv, unsigned char byRegOfs,
unsigned char byTestBits);