[PATCH] Staging: octeon: Apply Licence and resolves warnings according to TODO list. There are also a few "checks" that probably should revised but i think most of them could be resolved by breaking down cvmx_usb_poll_channel()

[Georgios Tsotsos]

Signed-off-by: Georgios Tsotsos <tsot...@gmail.com>
---
 drivers/staging/octeon-usb/octeon-hcd.c | 55 ++++++++++++++++++---------------
 drivers/staging/octeon-usb/octeon-hcd.h |  1 +
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/drivers/staging/octeon-usb/octeon-hcd.c 
b/drivers/staging/octeon-usb/octeon-hcd.c
index cded30f145aa..472ad5917ad2 100644
--- a/drivers/staging/octeon-usb/octeon-hcd.c
+++ b/drivers/staging/octeon-usb/octeon-hcd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
@@ -377,27 +378,29 @@ struct octeon_hcd {
 };
 
 /* This macro spins on a register waiting for it to reach a condition. */
-#define CVMX_WAIT_FOR_FIELD32(address, _union, cond, timeout_usec)         \
-       ({int result;                                                       \
-       do {                                                                \
-               u64 done = cvmx_get_cycle() + (u64)timeout_usec *           \
-                          octeon_get_clock_rate() / 1000000;               \
-               union _union c;                                             \
-                                                                           \
-               while (1) {                                                 \
-                       c.u32 = cvmx_usb_read_csr32(usb, address);          \
-                                                                           \
-                       if (cond) {                                         \
-                               result = 0;                                 \
-                               break;                                      \
-                       } else if (cvmx_get_cycle() > done) {               \
-                               result = -1;                                \
-                               break;                                      \
-                       } else                                              \
-                               __delay(100);                               \
-               }                                                           \
-       } while (0);                                                        \
-       result; })
+#define CVMX_WAIT_FOR_FIELD32(address, _union, cond, timeout_usec)     \
+({                                                                     \
+       int result;                                                     \
+       do {                                                            \
+               u64 done = cvmx_get_cycle() + (u64)(timeout_usec) *     \
+                          octeon_get_clock_rate() / 1000000;           \
+               union _union c;                                         \
+                                                                       \
+               while (1) {                                             \
+                       c.u32 = cvmx_usb_read_csr32(usb, address);      \
+                                                                       \
+                       if (cond) {                                     \
+                               result = 0;                             \
+                               break;                                  \
+                       } else if (cvmx_get_cycle() > done) {           \
+                               result = -1;                            \
+                               break;                                  \
+                       } else                                          \
+                               __delay(100);                           \
+               }                                                       \
+       } while (0);                                                    \
+       result;                                                         \
+})
 
 /*
  * This macro logically sets a single field in a CSR. It does the sequence
@@ -2636,12 +2639,14 @@ static int cvmx_usb_poll_channel(struct octeon_hcd 
*usb, int channel)
                                hcintmsk.u32 = 0;
                                hcintmsk.s.chhltdmsk = 1;
                                cvmx_usb_write_csr32(usb,
-                                                    
CVMX_USBCX_HCINTMSKX(channel, usb->index),
-                                                    hcintmsk.u32);
+                                               CVMX_USBCX_HCINTMSKX(channel,
+                                               usb->index),
+                                               hcintmsk.u32);
                                usbc_hcchar.s.chdis = 1;
                                cvmx_usb_write_csr32(usb,
-                                                    
CVMX_USBCX_HCCHARX(channel, usb->index),
-                                                    usbc_hcchar.u32);
+                                               CVMX_USBCX_HCCHARX(channel,
+                                               usb->index),
+                                               usbc_hcchar.u32);
                                return 0;
                        } else if (usbc_hcint.s.xfercompl) {
                                /*
diff --git a/drivers/staging/octeon-usb/octeon-hcd.h 
b/drivers/staging/octeon-usb/octeon-hcd.h
index 3353aefe662e..769c36cf6614 100644
--- a/drivers/staging/octeon-usb/octeon-hcd.h
+++ b/drivers/staging/octeon-usb/octeon-hcd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Octeon HCD hardware register definitions.
  *
-- 
2.16.4