Commit fb113408 authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: replace N_BYTE_ALIGMENT macro with PTR_ALIGN 



PTR_ALIGN is a bit shorter than N_BYTE_ALIGMENT.

Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8fc01db3

drivers/staging/rtl8188eu/core/rtw_recv.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter) 
	if (!precvpriv->pallocated_frame_buf)

		return _FAIL;



	precvpriv->precv_frame_buf = (u8 *)N_BYTE_ALIGMENT((size_t)(precvpriv->pallocated_frame_buf), RXFRAME_ALIGN_SZ);

	precvpriv->precv_frame_buf = PTR_ALIGN(precvpriv->pallocated_frame_buf, RXFRAME_ALIGN_SZ);



	precvframe = (struct recv_frame *)precvpriv->precv_frame_buf;

drivers/staging/rtl8188eu/core/rtw_xmit.c

+3 −3
Original line number Diff line number Diff line
@@ -86,7 +86,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 = PTR_ALIGN(pxmitpriv->pallocated_frame_buf, 4);

	/* pxmitpriv->pxmit_frame_buf = pxmitpriv->pallocated_frame_buf + 4 - */

	/* 						((size_t) (pxmitpriv->pallocated_frame_buf) &3); */
@@ -124,7 +124,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 = PTR_ALIGN(pxmitpriv->pallocated_xmitbuf, 4);

	/* pxmitpriv->pxmitbuf = pxmitpriv->pallocated_xmitbuf + 4 - */

	/* 						((size_t) (pxmitpriv->pallocated_xmitbuf) &3); */
@@ -166,7 +166,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 = PTR_ALIGN(pxmitpriv->pallocated_xmit_extbuf, 4);



	pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmit_extbuf;

drivers/staging/rtl8188eu/include/basic_types.h

+0 −4
Original line number Diff line number Diff line
@@ -137,8 +137,4 @@ value to host byte ordering.*/ 
		((((u8)__val) & BIT_LEN_MASK_8(__bitlen)) << (__bitoffset)) \

		)



/*  Get the N-bytes aligment offset from the current length */

#define	N_BYTE_ALIGMENT(__value, __aligment) ((__aligment == 1) ? \

	(__value) : (((__value + __aligment - 1) / __aligment) * __aligment))



#endif /* __BASIC_TYPES_H__ */

drivers/staging/rtl8188eu/os_dep/xmit_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitb 
	if (pxmitbuf->pallocated_buf == NULL)

		return _FAIL;



	pxmitbuf->pbuf = (u8 *)N_BYTE_ALIGMENT((size_t)(pxmitbuf->pallocated_buf), XMITBUF_ALIGN_SZ);

	pxmitbuf->pbuf = PTR_ALIGN(pxmitbuf->pallocated_buf, XMITBUF_ALIGN_SZ);

	pxmitbuf->dma_transfer_addr = 0;



	for (i = 0; i < 8; i++) {