src/patches/suse-2.6.27.31/patches.drivers/0021-Staging-SLICOSS-Fix-remaining-type-names.patch

   1 From 68cf95f3183c7bd60feab3bb774e1e4c7f36fe71 Mon Sep 17 00:00:00 2001
   2 From: Lior Dotan <liodot@gmail.com>
   3 Date: Tue, 7 Oct 2008 14:14:04 +0200
   4 Subject: [PATCH 21/23] Staging: SLICOSS: Fix remaining type names
   5 Patch-mainline: 2.6.28
   6
   7 Fix the remaining variables that still had '_t' as a postfix and also
   8 a couple of checkpatch warnings.
   9
  10 Signed-off-by: Lior Dotan <liodot@gmail.com>
  11 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  12 ---
  13  drivers/staging/slicoss/slic_os.h  |    6 ++++--
  14  drivers/staging/slicoss/slicdump.h |    2 +-
  15  drivers/staging/slicoss/slichw.h   |    6 +++---
  16  drivers/staging/slicoss/slicoss.c  |   30 +++++++++++++++---------------
  17  4 files changed, 23 insertions(+), 21 deletions(-)
  18
  19 diff --git a/drivers/staging/slicoss/slic_os.h b/drivers/staging/slicoss/slic_os.h
  20 index b0d2883..46c6784 100644
  21 --- a/drivers/staging/slicoss/slic_os.h
  22 +++ b/drivers/staging/slicoss/slic_os.h
  23 @@ -53,7 +53,8 @@
  24         {                                                           \
  25                 adapter->card->reg_type[adapter->card->debug_ix] = 0;   \
  26                 adapter->card->reg_offset[adapter->card->debug_ix] = \
  27 -                       ((unsigned char *)(&reg)) - ((unsigned char *)adapter->slic_regs); \
  28 +               ((unsigned char *)(&reg)) - \
  29 +               ((unsigned char *)adapter->slic_regs); \
  30                 adapter->card->reg_value[adapter->card->debug_ix++] = value;  \
  31                 if (adapter->card->debug_ix == 32) \
  32                         adapter->card->debug_ix = 0;                      \
  33 @@ -63,7 +64,8 @@
  34         {                                                           \
  35                 adapter->card->reg_type[adapter->card->debug_ix] = 1;        \
  36                 adapter->card->reg_offset[adapter->card->debug_ix] = \
  37 -                       ((unsigned char *)(&reg)) - ((unsigned char *)adapter->slic_regs); \
  38 +               ((unsigned char *)(&reg)) - \
  39 +               ((unsigned char *)adapter->slic_regs); \
  40                 adapter->card->reg_value[adapter->card->debug_ix] = value;   \
  41                 adapter->card->reg_valueh[adapter->card->debug_ix++] = valh;  \
  42                 if (adapter->card->debug_ix == 32) \
  43 diff --git a/drivers/staging/slicoss/slicdump.h b/drivers/staging/slicoss/slicdump.h
  44 index ca0a221..92a9b44 100644
  45 --- a/drivers/staging/slicoss/slicdump.h
  46 +++ b/drivers/staging/slicoss/slicdump.h
  47 @@ -228,7 +228,7 @@ struct CORE_Q {
  48  #define DRIVER_NAME_SIZE    32
  49
  50  struct sliccore_hdr {
  51 -    unsigned char   driver_version[DRIVER_NAME_SIZE];    /* Driver version string */
  52 +    unsigned char driver_version[DRIVER_NAME_SIZE]; /* Driver version string */
  53      u32   RcvRegOff;          /* Offset of receive registers */
  54      u32   RcvRegsize;         /* size of receive registers */
  55      u32   XmtRegOff;          /* Offset of transmit registers */
  56 diff --git a/drivers/staging/slicoss/slichw.h b/drivers/staging/slicoss/slichw.h
  57 index 4c5c15d..d03e90b 100644
  58 --- a/drivers/staging/slicoss/slichw.h
  59 +++ b/drivers/staging/slicoss/slichw.h
  60 @@ -702,7 +702,7 @@ struct vendor4_fru {
  61      unsigned char        pad[3];
  62  };
  63
  64 -union oemfru_t {
  65 +union oemfru {
  66      struct vendor1_fru   vendor1_fru;
  67      struct vendor2_fru   vendor2_fru;
  68      struct vendor3_fru   vendor3_fru;
  69 @@ -764,7 +764,7 @@ struct slic_eeprom {
  70         unsigned char   FruFormat;      /* Alacritech FRU format type */
  71         struct atk_fru   AtkFru;        /* Alacritech FRU information */
  72         unsigned char   OemFruFormat;   /* optional OEM FRU format type */
  73 -       union oemfru_t    OemFru;         /* optional OEM FRU information */
  74 +       union oemfru    OemFru;         /* optional OEM FRU information */
  75         unsigned char   Pad[4]; /* Pad to 128 bytes - includes 2 cksum bytes
  76                                  *(if OEM FRU info exists) and two unusable
  77                                  * bytes at the end */
  78 @@ -809,7 +809,7 @@ struct oslic_eeprom {
  79         unsigned char   FruFormat;      /* 35 Alacritech FRU format type */
  80         struct atk_fru  AtkFru; /* Alacritech FRU information */
  81         unsigned char   OemFruFormat;   /* optional OEM FRU format type */
  82 -       union oemfru_t    OemFru;         /* optional OEM FRU information */
  83 +       union oemfru    OemFru;         /* optional OEM FRU information */
  84         unsigned char   Pad[4]; /* Pad to 128 bytes - includes 2 checksum bytes
  85                                  * (if OEM FRU info exists) and two unusable
  86                                  * bytes at the end
  87 diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
  88 index f242477..c129e83 100644
  89 --- a/drivers/staging/slicoss/slicoss.c
  90 +++ b/drivers/staging/slicoss/slicoss.c
  91 @@ -1015,7 +1015,7 @@ static int slic_xmit_start(struct sk_buff *skb, struct net_device *dev)
  92
  93  #ifdef DEBUG_DUMP
  94         if (adapter->kill_card) {
  95 -               p_slic_host64_cmd_t ihcmd;
  96 +               struct slic_host64_cmd ihcmd;
  97
  98                 ihcmd = &hcmd->cmd64;
  99
 100 @@ -2455,7 +2455,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
 101         unsigned char fruformat;
 102         unsigned char oemfruformat;
 103         struct atk_fru *patkfru;
 104 -       union oemfru_t *poemfru;
 105 +       union oemfru *poemfru;
 106
 107         DBG_MSG
 108             ("slicoss: %s ENTER card[%p] adapter[%p] card->state[%x] \
 109 @@ -2692,7 +2692,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
 110          *  Allocate COMMAND BUFFER
 111          */
 112         if (!card->cmdbuffer) {
 113 -               card->cmdbuffer = kmalloc(sizeof(dump_cmd_t), GFP_ATOMIC);
 114 +               card->cmdbuffer = kmalloc(sizeof(struct dump_cmd), GFP_ATOMIC);
 115
 116                 ASSERT(card->cmdbuffer);
 117                 if (card->cmdbuffer == NULL)
 118 @@ -2702,7 +2702,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
 119          *  Smear the shared memory structure and then obtain
 120          *  the PHYSICAL address of this structure
 121          */
 122 -       memset(card->cmdbuffer, 0, sizeof(dump_cmd_t));
 123 +       memset(card->cmdbuffer, 0, sizeof(struct dump_cmd));
 124         card->cmdbuffer_phys = virt_to_bus(card->cmdbuffer);
 125         card->cmdbuffer_physh = SLIC_GET_ADDR_HIGH(card->cmdbuffer_phys);
 126         card->cmdbuffer_physl = SLIC_GET_ADDR_LOW(card->cmdbuffer_phys);
 127 @@ -4417,7 +4417,7 @@ static int slic_debug_card_show(struct seq_file *seq, void *v)
 128  #ifdef MOOKTODO
 129         int i;
 130         struct sliccard *card = seq->private;
 131 -       pslic_config_t config = &card->config;
 132 +       struct slic_config *config = &card->config;
 133         unsigned char *fru = (unsigned char *)(&card->config.atk_fru);
 134         unsigned char *oemfru = (unsigned char *)(&card->config.OemFru);
 135  #endif
 136 @@ -5311,7 +5311,7 @@ static u32 slic_dump_card(struct sliccard *card, bool resume)
 137         u32 queue;
 138         u32 len, offset;
 139         u32 sram_size, dram_size, regs;
 140 -       sliccore_hdr_t corehdr;
 141 +       struct sliccore_hdr corehdr;
 142         u32 file_offset;
 143         char *namestr;
 144         u32 i;
 145 @@ -5344,7 +5344,7 @@ static u32 slic_dump_card(struct sliccard *card, bool resume)
 146         }
 147         corehdr.driver_version[i] = 0;
 148
 149 -       file_offset = sizeof(sliccore_hdr_t);
 150 +       file_offset = sizeof(struct sliccore_hdr);
 151
 152         /*
 153          * Issue the following debug commands to the SLIC:
 154 @@ -5651,10 +5651,10 @@ done:
 155          */
 156         file_offset = 0;
 157         DBG_MSG("[slicmon] Write CoreHeader len[%x] offset[%x]\n",
 158 -               (uint) sizeof(sliccore_hdr_t), file_offset);
 159 +               (uint) sizeof(struct sliccore_hdr), file_offset);
 160
 161         result =
 162 -           slic_dump_write(card, &corehdr, sizeof(sliccore_hdr_t),
 163 +           slic_dump_write(card, &corehdr, sizeof(struct sliccore_hdr),
 164                             file_offset);
 165         DBG_MSG("[slicmon] corehdr  xoff[%x] xsz[%x]\n"
 166                 "    roff[%x] rsz[%x] fileoff[%x] filesz[%x]\n"
 167 @@ -5663,7 +5663,7 @@ done:
 168                 corehdr.XmtRegsize, corehdr.RcvRegOff, corehdr.RcvRegsize,
 169                 corehdr.FileRegOff, corehdr.FileRegsize, corehdr.SramOff,
 170                 corehdr.Sramsize, corehdr.DramOff, corehdr.Dramsize,
 171 -               (uint) sizeof(sliccore_hdr_t));
 172 +               (uint) sizeof(struct sliccore_hdr));
 173         for (i = 0; i < max_queues; i++) {
 174                 DBG_MSG("[slicmon]  QUEUE 0x%x  offset[%x] size[%x]\n",
 175                         (uint) i, corehdr.queues[i].queueOff,
 176 @@ -5706,7 +5706,7 @@ static u32 slic_dump_resume(struct sliccard *card, unsigned char proc)
 177
 178  static u32 slic_dump_reg(struct sliccard *card, unsigned char proc)
 179  {
 180 -       pdump_cmd_t dump = (pdump_cmd_t) card->cmdbuffer;
 181 +       struct dump_cmd *dump = (struct dump_cmd *)card->cmdbuffer;
 182
 183         dump->cmd = COMMAND_BYTE(CMD_DUMP, 0, proc);
 184         dump->desc = DESC_REG;
 185 @@ -5723,7 +5723,7 @@ static u32 slic_dump_reg(struct sliccard *card, unsigned char proc)
 186  static u32 slic_dump_data(struct sliccard *card,
 187                        u32 addr, ushort count, unsigned char desc)
 188  {
 189 -       pdump_cmd_t dump = (pdump_cmd_t) card->cmdbuffer;
 190 +       struct dump_cmd *dump = (struct dump_cmd *)card->cmdbuffer;
 191
 192         dump->cmd = COMMAND_BYTE(CMD_DUMP, 0, PROC_RECEIVE);
 193         dump->desc = desc;
 194 @@ -5740,7 +5740,7 @@ static u32 slic_dump_data(struct sliccard *card,
 195  static u32 slic_dump_queue(struct sliccard *card,
 196                         u32 addr, u32 buf_physh, u32 queue)
 197  {
 198 -       pdump_cmd_t dump = (pdump_cmd_t) card->cmdbuffer;
 199 +       struct dump_cmd *dump = (struct dump_cmd *)card->cmdbuffer;
 200
 201         dump->cmd = COMMAND_BYTE(CMD_DUMP, 0, PROC_RECEIVE);
 202         dump->desc = DESC_QUEUE;
 203 @@ -5756,7 +5756,7 @@ static u32 slic_dump_queue(struct sliccard *card,
 204  static u32 slic_dump_load_queue(struct sliccard *card, u32 data,
 205                                 u32 queue)
 206  {
 207 -       pdump_cmd_t load = (pdump_cmd_t) card->cmdbuffer;
 208 +       struct dump_cmd *load = (struct dump_cmd *) card->cmdbuffer;
 209
 210         load->cmd = COMMAND_BYTE(CMD_LOAD, 0, PROC_RECEIVE);
 211         load->desc = DESC_QUEUE;
 212 @@ -5771,7 +5771,7 @@ static u32 slic_dump_load_queue(struct sliccard *card, u32 data,
 213  static u32 slic_dump_cam(struct sliccard *card,
 214                       u32 addr, u32 count, unsigned char desc)
 215  {
 216 -       pdump_cmd_t dump = (pdump_cmd_t) card->cmdbuffer;
 217 +       struct dump_cmd *dump = (struct dump_cmd *)card->cmdbuffer;
 218
 219         dump->cmd = COMMAND_BYTE(CMD_CAM_OPS, 0, PROC_NONE);
 220         dump->desc = desc;
 221 --
 222 1.6.0.2
 223