Skip to contentSkip to conversation

staging: vt6655: Delete tmacro.h

PATCH New Philipp Hortmann 1 participant 1 message Apr 16, 2022 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: vt6655: Delete tmacro.h

Relocate the only macro MAKEWORD that is in use and remove file tmacro.h. File needs to be changed anyhow because of use of CamelCase which is not accepted by checkpatch.pl. Reduced code provides a better overview.

---
Tested with vt6655 on mini PCI Module Transferred this patch over wlan connection of vt6655

---
 drivers/staging/vt6655/baseband.c |  1 -
 drivers/staging/vt6655/card.c     |  1 -
 drivers/staging/vt6655/key.c      |  1 -
 drivers/staging/vt6655/mac.c      |  1 -
 drivers/staging/vt6655/mac.h      |  4 ++-
 drivers/staging/vt6655/srom.c     |  1 -
 drivers/staging/vt6655/tmacro.h   | 43 -------------------------------
 7 files changed, 3 insertions(+), 49 deletions(-)
 delete mode 100644 drivers/staging/vt6655/tmacro.h
drivers/staging/vt6655/baseband.c +0 -1
index decb55e96f02..21e691c3ea30 100644
@@ -29,7 +29,6 @@
  *
  */
 
-#include "tmacro.h"
 #include "mac.h"
 #include "baseband.h"
 #include "srom.h"
drivers/staging/vt6655/card.c +0 -1
index 1ccf08b1fd5c..022310af5485 100644
@@ -24,7 +24,6 @@
  *
  */
 
-#include "tmacro.h"
 #include "card.h"
 #include "baseband.h"
 #include "mac.h"
drivers/staging/vt6655/key.c +0 -1
index f843966a3ea4..1469015eb5b4 100644
@@ -11,7 +11,6 @@
  *
  */
 
-#include "tmacro.h"
 #include "key.h"
 #include "mac.h"
 
drivers/staging/vt6655/mac.c +0 -1
index 80cced7dfda8..88ddd0676463 100644
@@ -36,7 +36,6 @@
  *
  */
 
-#include "tmacro.h"
 #include "mac.h"
 
 /*
drivers/staging/vt6655/mac.h +3 -1
index 4d8496024abf..7970a42ee6e6 100644
@@ -18,7 +18,6 @@
 #ifndef __MAC_H__
 #define __MAC_H__
 
-#include "tmacro.h"
 #include "upc.h"
 
 /*---------------------  Export Definitions -------------------------*/
@@ -732,6 +731,9 @@ do {									\
 #define MACvSetRFLE_LatchBase(iobase)                                 \
 	MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_RFLEOPT)
 
+#define MAKEWORD(lb, hb) \
+	((unsigned short)(((unsigned char)(lb)) | (((unsigned short)((unsigned char)(hb))) << 8)))
+
 bool MACbIsRegBitsOff(struct vnt_private *priv, unsigned char byRegOfs,
 		      unsigned char byTestBits);
 
drivers/staging/vt6655/srom.c +0 -1
index 84ec9eb8cdd3..8786b55161fa 100644
@@ -28,7 +28,6 @@
  */
 
 #include "upc.h"
-#include "tmacro.h"
 #include "mac.h"
 #include "srom.h"
 
drivers/staging/vt6655/tmacro.h deleted +0 -43

43 lines not on this page · raw message

Signature · 1 line
2.25.1