Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-07 21:53:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: vt6655: Delete tmacro.h

Browse Source 
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.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/20220416191622.GA11596@matrix-ESPRIMO-P710
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Philipp Hortmann 2022-04-16 21:16:22 +02:00 committed by Greg Kroah-Hartman
parent e5f45b011e
commit b8ce0acfa4
7 changed files with 3 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/vt6655/baseband.c
View File

@ -29,7 +29,6 @@
*
*/
#include "tmacro.h"
#include "mac.h"
#include "baseband.h"
#include "srom.h"

1
drivers/staging/vt6655/card.c
View File

@ -24,7 +24,6 @@
*
*/
#include "tmacro.h"
#include "card.h"
#include "baseband.h"
#include "mac.h"

1
drivers/staging/vt6655/key.c
View File

@ -11,7 +11,6 @@
*
*/
#include "tmacro.h"
#include "key.h"
#include "mac.h"

1
drivers/staging/vt6655/mac.c
View File

@ -36,7 +36,6 @@
*
*/
#include "tmacro.h"
#include "mac.h"
/*

4
drivers/staging/vt6655/mac.h
View File

@ -18,7 +18,6 @@
#ifndef __MAC_H__
#define __MAC_H__
#include "tmacro.h"
#include "upc.h"
/*--------------------- Export Definitions -------------------------*/
@ -741,6 +740,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);

1
drivers/staging/vt6655/srom.c
View File

@ -28,7 +28,6 @@
*/
#include "upc.h"
#include "tmacro.h"
#include "mac.h"
#include "srom.h"

43
drivers/staging/vt6655/tmacro.h
View File

@ -1,43 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
* All rights reserved.
*
* Purpose: define basic common types and macros
*
* Author: Tevin Chen
*
* Date: May 21, 1996
*
*/
#ifndef __TMACRO_H__
#define __TMACRO_H__
/****** Common helper macros ***********************************************/
#if !defined(LOBYTE)
#define LOBYTE(w) ((unsigned char)(w))
#endif
#if !defined(HIBYTE)
#define HIBYTE(w) ((unsigned char)(((unsigned short)(w) >> 8) & 0xFF))
#endif
#if !defined(LOWORD)
#define LOWORD(d) ((unsigned short)(d))
#endif
#if !defined(HIWORD)
#define HIWORD(d) ((unsigned short)((((unsigned long)(d)) >> 16) & 0xFFFF))
#endif
#define LODWORD(q) ((q).u.dwLowDword)
#define HIDWORD(q) ((q).u.dwHighDword)
#if !defined(MAKEWORD)
#define MAKEWORD(lb, hb) ((unsigned short)(((unsigned char)(lb)) | (((unsigned short)((unsigned char)(hb))) << 8)))
#endif
#if !defined(MAKEDWORD)
#define MAKEDWORD(lw, hw) ((unsigned long)(((unsigned short)(lw)) | (((unsigned long)((unsigned short)(hw))) << 16)))
#endif
#endif /* __TMACRO_H__ */