* [PATCH 1/2] staging: r8188eu: replace N_BYTE_ALIGMENT with ALIGN
2022-06-20 17:19 [PATCH 0/2] get rid of useless header file Nam Cao
@ 2022-06-20 17:19 ` Nam Cao
2022-06-20 17:19 ` [PATCH 2/2] staging: r8188eu: remove basic_types.h Nam Cao
2022-06-20 20:02 ` [PATCH 0/2] get rid of useless header file Larry Finger
2 siblings, 0 replies; 4+ messages in thread
From: Nam Cao @ 2022-06-20 17:19 UTC (permalink / raw)
To: gregkh; +Cc: linux-kernel, linux-staging, namcaov, phil, Larry.Finger,
paskripkin
Replace the macro N_BYTE_ALIGMENT (defined in this driver) with ALIGN
because they do the same thing.
Signed-off-by: Nam Cao <namcaov@gmail.com>
---
drivers/staging/r8188eu/core/rtw_recv.c | 2 +-
drivers/staging/r8188eu/core/rtw_xmit.c | 6 +++---
drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 2 +-
drivers/staging/r8188eu/os_dep/xmit_linux.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r8188eu/core/rtw_recv.c
index fe3d597fea69..36ea79586992 100644
--- a/drivers/staging/r8188eu/core/rtw_recv.c
+++ b/drivers/staging/r8188eu/core/rtw_recv.c
@@ -62,7 +62,7 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
goto exit;
}
- precvpriv->precv_frame_buf = (u8 *)N_BYTE_ALIGMENT((size_t)(precvpriv->pallocated_frame_buf), RXFRAME_ALIGN_SZ);
+ precvpriv->precv_frame_buf = (u8 *)ALIGN((size_t)(precvpriv->pallocated_frame_buf), RXFRAME_ALIGN_SZ);
precvframe = (struct recv_frame *)precvpriv->precv_frame_buf;
diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c
index 647c38134d2a..24401f3ae2a0 100644
--- a/drivers/staging/r8188eu/core/rtw_xmit.c
+++ b/drivers/staging/r8188eu/core/rtw_xmit.c
@@ -74,7 +74,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
res = _FAIL;
goto exit;
}
- pxmitpriv->pxmit_frame_buf = (u8 *)N_BYTE_ALIGMENT((size_t)(pxmitpriv->pallocated_frame_buf), 4);
+ pxmitpriv->pxmit_frame_buf = (u8 *)ALIGN((size_t)(pxmitpriv->pallocated_frame_buf), 4);
/* pxmitpriv->pxmit_frame_buf = pxmitpriv->pallocated_frame_buf + 4 - */
/* ((size_t) (pxmitpriv->pallocated_frame_buf) &3); */
@@ -111,7 +111,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
goto exit;
}
- pxmitpriv->pxmitbuf = (u8 *)N_BYTE_ALIGMENT((size_t)(pxmitpriv->pallocated_xmitbuf), 4);
+ pxmitpriv->pxmitbuf = (u8 *)ALIGN((size_t)(pxmitpriv->pallocated_xmitbuf), 4);
/* pxmitpriv->pxmitbuf = pxmitpriv->pallocated_xmitbuf + 4 - */
/* ((size_t) (pxmitpriv->pallocated_xmitbuf) &3); */
@@ -151,7 +151,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
goto exit;
}
- pxmitpriv->pxmit_extbuf = (u8 *)N_BYTE_ALIGMENT((size_t)(pxmitpriv->pallocated_xmit_extbuf), 4);
+ pxmitpriv->pxmit_extbuf = (u8 *)ALIGN((size_t)(pxmitpriv->pallocated_xmit_extbuf), 4);
pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmit_extbuf;
diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c b/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
index 727e1adce1dc..def6d0d6e402 100644
--- a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
+++ b/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
@@ -32,7 +32,7 @@ int rtl8188eu_init_recv_priv(struct adapter *padapter)
goto exit;
}
- precvpriv->precv_buf = (u8 *)N_BYTE_ALIGMENT((size_t)(precvpriv->pallocated_recv_buf), 4);
+ precvpriv->precv_buf = (u8 *)ALIGN((size_t)(precvpriv->pallocated_recv_buf), 4);
precvbuf = (struct recv_buf *)precvpriv->precv_buf;
diff --git a/drivers/staging/r8188eu/os_dep/xmit_linux.c b/drivers/staging/r8188eu/os_dep/xmit_linux.c
index e430c64e9068..91a1e4e3219a 100644
--- a/drivers/staging/r8188eu/os_dep/xmit_linux.c
+++ b/drivers/staging/r8188eu/os_dep/xmit_linux.c
@@ -71,7 +71,7 @@ int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitb
if (!pxmitbuf->pallocated_buf)
return _FAIL;
- pxmitbuf->pbuf = (u8 *)N_BYTE_ALIGMENT((size_t)(pxmitbuf->pallocated_buf), XMITBUF_ALIGN_SZ);
+ pxmitbuf->pbuf = (u8 *)ALIGN((size_t)(pxmitbuf->pallocated_buf), XMITBUF_ALIGN_SZ);
pxmitbuf->dma_transfer_addr = 0;
pxmitbuf->pxmit_urb = usb_alloc_urb(0, GFP_KERNEL);
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] staging: r8188eu: remove basic_types.h
2022-06-20 17:19 [PATCH 0/2] get rid of useless header file Nam Cao
2022-06-20 17:19 ` [PATCH 1/2] staging: r8188eu: replace N_BYTE_ALIGMENT with ALIGN Nam Cao
@ 2022-06-20 17:19 ` Nam Cao
2022-06-20 20:02 ` [PATCH 0/2] get rid of useless header file Larry Finger
2 siblings, 0 replies; 4+ messages in thread
From: Nam Cao @ 2022-06-20 17:19 UTC (permalink / raw)
To: gregkh; +Cc: linux-kernel, linux-staging, namcaov, phil, Larry.Finger,
paskripkin
Remove file basic_types.h because the content of this file is not used
anywhere.
Signed-off-by: Nam Cao <namcaov@gmail.com>
---
drivers/staging/r8188eu/include/basic_types.h | 19 -------------------
.../staging/r8188eu/include/osdep_service.h | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 drivers/staging/r8188eu/include/basic_types.h
diff --git a/drivers/staging/r8188eu/include/basic_types.h b/drivers/staging/r8188eu/include/basic_types.h
deleted file mode 100644
index 0b71e2c6e41a..000000000000
--- a/drivers/staging/r8188eu/include/basic_types.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
-/* Copyright(c) 2007 - 2011 Realtek Corporation. */
-
-#ifndef __BASIC_TYPES_H__
-#define __BASIC_TYPES_H__
-
-#include <linux/types.h>
-#define NDIS_OID uint
-
-typedef void (*proc_t)(void *);
-
-/* port from fw */
-/* TODO: Macros Below are Sync from SD7-Driver. It is necessary
- * to check correctness */
-
-#define N_BYTE_ALIGMENT(__value, __aligment) ((__aligment == 1) ? \
- (__value) : (((__value + __aligment - 1) / __aligment) * __aligment))
-
-#endif /* __BASIC_TYPES_H__ */
diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/staging/r8188eu/include/osdep_service.h
index f1a703643e74..1d97d5be46d5 100644
--- a/drivers/staging/r8188eu/include/osdep_service.h
+++ b/drivers/staging/r8188eu/include/osdep_service.h
@@ -5,7 +5,6 @@
#define __OSDEP_SERVICE_H_
#include <linux/sched/signal.h>
-#include "basic_types.h"
#define _FAIL 0
#define _SUCCESS 1
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 0/2] get rid of useless header file
2022-06-20 17:19 [PATCH 0/2] get rid of useless header file Nam Cao
2022-06-20 17:19 ` [PATCH 1/2] staging: r8188eu: replace N_BYTE_ALIGMENT with ALIGN Nam Cao
2022-06-20 17:19 ` [PATCH 2/2] staging: r8188eu: remove basic_types.h Nam Cao
@ 2022-06-20 20:02 ` Larry Finger
2 siblings, 0 replies; 4+ messages in thread
From: Larry Finger @ 2022-06-20 20:02 UTC (permalink / raw)
To: Nam Cao, gregkh; +Cc: linux-kernel, linux-staging, phil, paskripkin
On 6/20/22 12:19, Nam Cao wrote:
> The stuffs in basic_types.h are either not used, or already defined in
> the kernel. Get rid of it.
>
> Nam Cao (2):
> staging: r8188eu: replace N_BYTE_ALIGMENT with ALIGN
> staging: r8188eu: remove basic_types.h
>
> drivers/staging/r8188eu/core/rtw_recv.c | 2 +-
> drivers/staging/r8188eu/core/rtw_xmit.c | 6 +++---
> drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 2 +-
> drivers/staging/r8188eu/include/basic_types.h | 19 -------------------
> .../staging/r8188eu/include/osdep_service.h | 1 -
> drivers/staging/r8188eu/os_dep/xmit_linux.c | 2 +-
> 6 files changed, 6 insertions(+), 26 deletions(-)
> delete mode 100644 drivers/staging/r8188eu/include/basic_types.h
>
For future patch sets, please include the "staging: r8188eu:" part of the
subject of the cover letter. It makes it easier to sort out the rest of the
patches; however,it is not necessary to resubmit this one.
The two patchesw are fine.
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Thanks,
Larry
^ permalink raw reply [flat|nested] 4+ messages in thread