Staging: SLICOSS: Fix remaining type names

Fix the remaining variables that still had '_t' as a postfix and also
a couple of checkpatch warnings.

Signed-off-by: Lior Dotan <liodot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/slicoss/slic_os.h b/drivers/staging/slicoss/slic_os.h
index b0d2883..46c6784 100644 (file)
--- a/drivers/staging/slicoss/slic_os.h
+++ b/drivers/staging/slicoss/slic_os.h
@@ -53,7 +53,8 @@
        {                                                           \
                adapter->card->reg_type[adapter->card->debug_ix] = 0;   \
                adapter->card->reg_offset[adapter->card->debug_ix] = \
-                       ((unsigned char *)(&reg)) - ((unsigned char *)adapter->slic_regs); \
+               ((unsigned char *)(&reg)) - \
+               ((unsigned char *)adapter->slic_regs); \
                adapter->card->reg_value[adapter->card->debug_ix++] = value;  \
                if (adapter->card->debug_ix == 32) \
                        adapter->card->debug_ix = 0;                      \
@@ -63,7 +64,8 @@
        {                                                           \
                adapter->card->reg_type[adapter->card->debug_ix] = 1;        \
                adapter->card->reg_offset[adapter->card->debug_ix] = \
-                       ((unsigned char *)(&reg)) - ((unsigned char *)adapter->slic_regs); \
+               ((unsigned char *)(&reg)) - \
+               ((unsigned char *)adapter->slic_regs); \
                adapter->card->reg_value[adapter->card->debug_ix] = value;   \
                adapter->card->reg_valueh[adapter->card->debug_ix++] = valh;  \
                if (adapter->card->debug_ix == 32) \

diff --git a/drivers/staging/slicoss/slicdump.h b/drivers/staging/slicoss/slicdump.h
index ca0a221..92a9b44 100644 (file)
--- a/drivers/staging/slicoss/slicdump.h
+++ b/drivers/staging/slicoss/slicdump.h
@@ -228,7 +228,7 @@ struct CORE_Q {
 #define DRIVER_NAME_SIZE    32
 
 struct sliccore_hdr {
-    unsigned char   driver_version[DRIVER_NAME_SIZE];    /* Driver version string */
+    unsigned char driver_version[DRIVER_NAME_SIZE]; /* Driver version string */
     u32   RcvRegOff;          /* Offset of receive registers */
     u32   RcvRegsize;         /* size of receive registers */
     u32   XmtRegOff;          /* Offset of transmit registers */

diff --cc drivers/staging/slicoss/slichw.h
Simple merge

diff --cc drivers/staging/slicoss/slicoss.c
Simple merge