Commit 8af028c2 authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: Convert macro vt6655_mac_word_reg_bits_off to function 



Convert macro vt6655_mac_word_reg_bits_off to function.
checkpatch.pl does not accept multiline macros.

Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/04fb37871c4d383c27287934a0dddb3aa7974b08.1657657918.git.philipp.g.hortmann@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 64a5c7bf

drivers/staging/vt6655/mac.c

+8 −0
Original line number Diff line number Diff line
@@ -62,6 +62,14 @@ void vt6655_mac_reg_bits_off(void __iomem *iobase, const u8 reg_offset, const u8 
	iowrite8(reg_value & ~(bit_mask), iobase + reg_offset);

}



void vt6655_mac_word_reg_bits_off(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

drivers/staging/vt6655/mac.h

+2 −7
Original line number Diff line number Diff line
@@ -537,13 +537,6 @@ 


/*---------------------  Export Macros ------------------------------*/



#define vt6655_mac_word_reg_bits_off(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 MACvReceive0(iobase)						\

do {									\

	unsigned long dwData;						\
@@ -648,6 +641,8 @@ 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);

void vt6655_mac_word_reg_bits_off(void __iomem *iobase, const u8 reg_offset, const u16 bit_mask);



bool MACbIsRegBitsOff(struct vnt_private *priv, unsigned char byRegOfs,

		      unsigned char byTestBits);