diff options
| author | Philipp Hortmann <philipp.g.hortmann@gmail.com> | 2022-07-13 08:01:37 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-07-14 16:48:38 +0300 |
| commit | 77072b0f4b5559a7e649b49aebdc71b1b083bf98 (patch) | |
| tree | 19266f31bdbecfd3f34c427ffce5aa2dd215c822 /drivers/staging | |
| parent | 1b225449151fd01fa83ca144996509e2f936a8a2 (diff) | |
| download | linux-77072b0f4b5559a7e649b49aebdc71b1b083bf98.tar.xz | |
staging: vt6655: Convert macro vt6655_mac_word_reg_bits_on to function
Convert macro vt6655_mac_word_reg_bits_on 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/255c7f5a5e98a399aa4e299e7cf567016bd86d60.1657657918.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/vt6655/mac.c | 8 | ||||
| -rw-r--r-- | drivers/staging/vt6655/mac.h | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index 902034a28c6c..076e1bfff3e0 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -46,6 +46,14 @@ void vt6655_mac_reg_bits_on(void __iomem *iobase, const u8 reg_offset, const u8 iowrite8(reg_value | bit_mask, iobase + reg_offset); } +void vt6655_mac_word_reg_bits_on(void __iomem *iobase, const u8 reg_offset, const u16 bit_mask) +{ + unsigned short reg_value; + + reg_value = ioread16(iobase + reg_offset); + iowrite16(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 031316d42dba..3b23334db538 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -537,13 +537,6 @@ /*--------------------- Export Macros ------------------------------*/ -#define vt6655_mac_word_reg_bits_on(iobase, reg_offset, bit_mask) \ -do { \ - unsigned short reg_value; \ - reg_value = ioread16(iobase + reg_offset); \ - iowrite16(reg_value | (bit_mask), iobase + reg_offset); \ -} while (0) - #define vt6655_mac_reg_bits_off(iobase, reg_offset, bit_mask) \ do { \ unsigned char reg_value; \ @@ -660,6 +653,7 @@ do { \ ((unsigned short)(((unsigned char)(lb)) | (((unsigned short)((unsigned char)(hb))) << 8))) 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); bool MACbIsRegBitsOff(struct vnt_private *priv, unsigned char byRegOfs, unsigned char byTestBits); |