Commit 77072b0f authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

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: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/255c7f5a5e98a399aa4e299e7cf567016bd86d60.1657657918.git.philipp.g.hortmann@gmail.com


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

drivers/staging/vt6655/mac.c

+8 −0
Original line number Diff line number Diff line
@@ -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

drivers/staging/vt6655/mac.h

+1 −7
Original line number Diff line number Diff line
@@ -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);