Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / rtl8712 / rtl871x_recv.h

diff --git a/drivers/staging/rtl8712/rtl871x_recv.h b/drivers/staging/rtl8712/rtl871x_recv.h
index 77487bb9d3c00f6f8dca355cd7078ccf281b77e8..f419943ad75da5af35a94f4f52c712bf58e91611 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_recv.h
+++ b/drivers/staging/rtl8712/rtl871x_recv.h
@@ -153,7 +153,8 @@ static inline u8 *get_recvframe_data(union recv_frame *precvframe)
 static inline u8 *recvframe_pull(union recv_frame *precvframe, sint sz)
 {
        /* used for extract sz bytes from rx_data, update rx_data and return
-        *  the updated rx_data to the caller */
+        * the updated rx_data to the caller
+        */
        if (precvframe == NULL)
                return NULL;
        precvframe->u.hdr.rx_data += sz;
@@ -169,7 +170,8 @@ static inline u8 *recvframe_put(union recv_frame *precvframe, sint sz)
 {
        /* used for append sz bytes from ptr to rx_tail, update rx_tail and
         * return the updated rx_tail to the caller
-        * after putting, rx_tail must be still larger than rx_end. */
+        * after putting, rx_tail must be still larger than rx_end.
+        */
        if (precvframe == NULL)
                return NULL;
        precvframe->u.hdr.rx_tail += sz;
@@ -186,7 +188,8 @@ static inline u8 *recvframe_pull_tail(union recv_frame *precvframe, sint sz)
        /* rmv data from rx_tail (by yitsen)
         * used for extract sz bytes from rx_end, update rx_end and return the
         * updated rx_end to the caller
-        * after pulling, rx_end must be still larger than rx_data. */
+        * after pulling, rx_end must be still larger than rx_data.
+        */
        if (precvframe == NULL)
                return NULL;
        precvframe->u.hdr.rx_tail -= sz;