aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLior Dotan <liodot@gmail.com>2008-10-07 08:14:04 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-10-10 18:31:13 -0400
commit68cf95f3183c7bd60feab3bb774e1e4c7f36fe71 (patch)
treee5aa1f6910a184cfd976e7cfd7d088b8be8038cb /drivers
parent4578ca0fc2be611ea98618b028ecfbb2415cd990 (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/slicoss/slic_os.h6
-rw-r--r--drivers/staging/slicoss/slicdump.h2
-rw-r--r--drivers/staging/slicoss/slichw.h6
-rw-r--r--drivers/staging/slicoss/slicoss.c30
4 files changed, 23 insertions, 21 deletions
diff --git a/drivers/staging/slicoss/slic_os.h b/drivers/staging/slicoss/slic_os.h
index b0d2883034ce..46c678440d28 100644
--- a/drivers/staging/slicoss/slic_os.h
+++ b/drivers/staging/slicoss/slic_os.h
@@ -53,7 +53,8 @@
53 { \ 53 { \
54 adapter->card->reg_type[adapter->card->debug_ix] = 0; \ 54 adapter->card->reg_type[adapter->card->debug_ix] = 0; \
55 adapter->card->reg_offset[adapter->card->debug_ix] = \ 55 adapter->card->reg_offset[adapter->card->debug_ix] = \
56 ((unsigned char *)(&reg)) - ((unsigned char *)adapter->slic_regs); \ 56 ((unsigned char *)(&reg)) - \
57 ((unsigned char *)adapter->slic_regs); \
57 adapter->card->reg_value[adapter->card->debug_ix++] = value; \ 58 adapter->card->reg_value[adapter->card->debug_ix++] = value; \
58 if (adapter->card->debug_ix == 32) \ 59 if (adapter->card->debug_ix == 32) \
59 adapter->card->debug_ix = 0; \ 60 adapter->card->debug_ix = 0; \
@@ -63,7 +64,8 @@
63 { \ 64 { \
64 adapter->card->reg_type[adapter->card->debug_ix] = 1; \ 65 adapter->card->reg_type[adapter->card->debug_ix] = 1; \
65 adapter->card->reg_offset[adapter->card->debug_ix] = \ 66 adapter->card->reg_offset[adapter->card->debug_ix] = \
66 ((unsigned char *)(&reg)) - ((unsigned char *)adapter->slic_regs); \ 67 ((unsigned char *)(&reg)) - \
68 ((unsigned char *)adapter->slic_regs); \
67 adapter->card->reg_value[adapter->card->debug_ix] = value; \ 69 adapter->card->reg_value[adapter->card->debug_ix] = value; \
68 adapter->card->reg_valueh[adapter->card->debug_ix++] = valh; \ 70 adapter->card->reg_valueh[adapter->card->debug_ix++] = valh; \
69 if (adapter->card->debug_ix == 32) \ 71 if (adapter->card->debug_ix == 32) \
diff --git a/drivers/staging/slicoss/slicdump.h b/drivers/staging/slicoss/slicdump.h
index ca0a2216f707..92a9b44bcade 100644
--- a/drivers/staging/slicoss/slicdump.h
+++ b/drivers/staging/slicoss/slicdump.h
@@ -228,7 +228,7 @@ struct CORE_Q {
228#define DRIVER_NAME_SIZE 32 228#define DRIVER_NAME_SIZE 32
229 229
230struct sliccore_hdr { 230struct sliccore_hdr {
231 unsigned char driver_version[DRIVER_NAME_SIZE]; /* Driver version string */ 231 unsigned char driver_version[DRIVER_NAME_SIZE]; /* Driver version string */
232 u32 RcvRegOff; /* Offset of receive registers */ 232 u32 RcvRegOff; /* Offset of receive registers */
233 u32 RcvRegsize; /* size of receive registers */ 233 u32 RcvRegsize; /* size of receive registers */
234 u32 XmtRegOff; /* Offset of transmit registers */ 234 u32 XmtRegOff; /* Offset of transmit registers */
diff --git a/drivers/staging/slicoss/slichw.h b/drivers/staging/slicoss/slichw.h
index 4c5c15d49e67..d03e90b06753 100644
--- a/drivers/staging/slicoss/slichw.h
+++ b/drivers/staging/slicoss/slichw.h
@@ -702,7 +702,7 @@ struct vendor4_fru {
702 unsigned char pad[3]; 702 unsigned char pad[3];
703}; 703};
704 704
705union oemfru_t { 705union oemfru {
706 struct vendor1_fru vendor1_fru; 706 struct vendor1_fru vendor1_fru;
707 struct vendor2_fru vendor2_fru; 707 struct vendor2_fru vendor2_fru;
708 struct vendor3_fru vendor3_fru; 708 struct vendor3_fru vendor3_fru;
@@ -764,7 +764,7 @@ struct slic_eeprom {
764 unsigned char FruFormat; /* Alacritech FRU format type */ 764 unsigned char FruFormat; /* Alacritech FRU format type */
765 struct atk_fru AtkFru; /* Alacritech FRU information */ 765 struct atk_fru AtkFru; /* Alacritech FRU information */
766 unsigned char OemFruFormat; /* optional OEM FRU format type */ 766 unsigned char OemFruFormat; /* optional OEM FRU format type */
767 union oemfru_t OemFru; /* optional OEM FRU information */ 767 union oemfru OemFru; /* optional OEM FRU information */
768 unsigned char Pad[4]; /* Pad to 128 bytes - includes 2 cksum bytes 768 unsigned char Pad[4]; /* Pad to 128 bytes - includes 2 cksum bytes
769 *(if OEM FRU info exists) and two unusable 769 *(if OEM FRU info exists) and two unusable
770 * bytes at the end */ 770 * bytes at the end */
@@ -809,7 +809,7 @@ struct oslic_eeprom {
809 unsigned char FruFormat; /* 35 Alacritech FRU format type */ 809 unsigned char FruFormat; /* 35 Alacritech FRU format type */
810 struct atk_fru AtkFru; /* Alacritech FRU information */ 810 struct atk_fru AtkFru; /* Alacritech FRU information */
811 unsigned char OemFruFormat; /* optional OEM FRU format type */ 811 unsigned char OemFruFormat; /* optional OEM FRU format type */
812 union oemfru_t OemFru; /* optional OEM FRU information */ 812 union oemfru OemFru; /* optional OEM FRU information */
813 unsigned char Pad[4]; /* Pad to 128 bytes - includes 2 checksum bytes 813 unsigned char Pad[4]; /* Pad to 128 bytes - includes 2 checksum bytes
814 * (if OEM FRU info exists) and two unusable 814 * (if OEM FRU info exists) and two unusable
815 * bytes at the end 815 * bytes at the end
diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index f24247797262..c129e83e2f4e 100644
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -1015,7 +1015,7 @@ static int slic_xmit_start(struct sk_buff *skb, struct net_device *dev)
1015 1015
1016#ifdef DEBUG_DUMP 1016#ifdef DEBUG_DUMP
1017 if (adapter->kill_card) { 1017 if (adapter->kill_card) {
1018 p_slic_host64_cmd_t ihcmd; 1018 struct slic_host64_cmd ihcmd;
1019 1019
1020 ihcmd = &hcmd->cmd64; 1020 ihcmd = &hcmd->cmd64;
1021 1021
@@ -2455,7 +2455,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
2455 unsigned char fruformat; 2455 unsigned char fruformat;
2456 unsigned char oemfruformat; 2456 unsigned char oemfruformat;
2457 struct atk_fru *patkfru; 2457 struct atk_fru *patkfru;
2458 union oemfru_t *poemfru; 2458 union oemfru *poemfru;
2459 2459
2460 DBG_MSG 2460 DBG_MSG
2461 ("slicoss: %s ENTER card[%p] adapter[%p] card->state[%x] \ 2461 ("slicoss: %s ENTER card[%p] adapter[%p] card->state[%x] \
@@ -2692,7 +2692,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
2692 * Allocate COMMAND BUFFER 2692 * Allocate COMMAND BUFFER
2693 */ 2693 */
2694 if (!card->cmdbuffer) { 2694 if (!card->cmdbuffer) {
2695 card->cmdbuffer = kmalloc(sizeof(dump_cmd_t), GFP_ATOMIC); 2695 card->cmdbuffer = kmalloc(sizeof(struct dump_cmd), GFP_ATOMIC);
2696 2696
2697 ASSERT(card->cmdbuffer); 2697 ASSERT(card->cmdbuffer);
2698 if (card->cmdbuffer == NULL) 2698 if (card->cmdbuffer == NULL)
@@ -2702,7 +2702,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
2702 * Smear the shared memory structure and then obtain 2702 * Smear the shared memory structure and then obtain
2703 * the PHYSICAL address of this structure 2703 * the PHYSICAL address of this structure
2704 */ 2704 */
2705 memset(card->cmdbuffer, 0, sizeof(dump_cmd_t)); 2705 memset(card->cmdbuffer, 0, sizeof(struct dump_cmd));
2706 card->cmdbuffer_phys = virt_to_bus(card->cmdbuffer); 2706 card->cmdbuffer_phys = virt_to_bus(card->cmdbuffer);
2707 card->cmdbuffer_physh = SLIC_GET_ADDR_HIGH(card->cmdbuffer_phys); 2707 card->cmdbuffer_physh = SLIC_GET_ADDR_HIGH(card->cmdbuffer_phys);
2708 card->cmdbuffer_physl = SLIC_GET_ADDR_LOW(card->cmdbuffer_phys); 2708 card->cmdbuffer_physl = SLIC_GET_ADDR_LOW(card->cmdbuffer_phys);
@@ -4417,7 +4417,7 @@ static int slic_debug_card_show(struct seq_file *seq, void *v)
4417#ifdef MOOKTODO 4417#ifdef MOOKTODO
4418 int i; 4418 int i;
4419 struct sliccard *card = seq->private; 4419 struct sliccard *card = seq->private;
4420 pslic_config_t config = &card->config; 4420 struct slic_config *config = &card->config;
4421 unsigned char *fru = (unsigned char *)(&card->config.atk_fru); 4421 unsigned char *fru = (unsigned char *)(&card->config.atk_fru);
4422 unsigned char *oemfru = (unsigned char *)(&card->config.OemFru); 4422 unsigned char *oemfru = (unsigned char *)(&card->config.OemFru);
4423#endif 4423#endif
@@ -5311,7 +5311,7 @@ static u32 slic_dump_card(struct sliccard *card, bool resume)
5311 u32 queue; 5311 u32 queue;
5312 u32 len, offset; 5312 u32 len, offset;
5313 u32 sram_size, dram_size, regs; 5313 u32 sram_size, dram_size, regs;
5314 sliccore_hdr_t corehdr; 5314 struct sliccore_hdr corehdr;
5315 u32 file_offset; 5315 u32 file_offset;
5316 char *namestr; 5316 char *namestr;
5317 u32 i; 5317 u32 i;
@@ -5344,7 +5344,7 @@ static u32 slic_dump_card(struct sliccard *card, bool resume)
5344 } 5344 }
5345 corehdr.driver_version[i] = 0; 5345 corehdr.driver_version[i] = 0;
5346 5346
5347 file_offset = sizeof(sliccore_hdr_t); 5347 file_offset = sizeof(struct sliccore_hdr);
5348 5348
5349 /* 5349 /*
5350 * Issue the following debug commands to the SLIC: 5350 * Issue the following debug commands to the SLIC:
@@ -5651,10 +5651,10 @@ done:
5651 */ 5651 */
5652 file_offset = 0; 5652 file_offset = 0;
5653 DBG_MSG("[slicmon] Write CoreHeader len[%x] offset[%x]\n", 5653 DBG_MSG("[slicmon] Write CoreHeader len[%x] offset[%x]\n",
5654 (uint) sizeof(sliccore_hdr_t), file_offset); 5654 (uint) sizeof(struct sliccore_hdr), file_offset);
5655 5655
5656 result = 5656 result =
5657 slic_dump_write(card, &corehdr, sizeof(sliccore_hdr_t), 5657 slic_dump_write(card, &corehdr, sizeof(struct sliccore_hdr),
5658 file_offset); 5658 file_offset);
5659 DBG_MSG("[slicmon] corehdr xoff[%x] xsz[%x]\n" 5659 DBG_MSG("[slicmon] corehdr xoff[%x] xsz[%x]\n"
5660 " roff[%x] rsz[%x] fileoff[%x] filesz[%x]\n" 5660 " roff[%x] rsz[%x] fileoff[%x] filesz[%x]\n"
@@ -5663,7 +5663,7 @@ done:
5663 corehdr.XmtRegsize, corehdr.RcvRegOff, corehdr.RcvRegsize, 5663 corehdr.XmtRegsize, corehdr.RcvRegOff, corehdr.RcvRegsize,
5664 corehdr.FileRegOff, corehdr.FileRegsize, corehdr.SramOff, 5664 corehdr.FileRegOff, corehdr.FileRegsize, corehdr.SramOff,
5665 corehdr.Sramsize, corehdr.DramOff, corehdr.Dramsize, 5665 corehdr.Sramsize, corehdr.DramOff, corehdr.Dramsize,
5666 (uint) sizeof(sliccore_hdr_t)); 5666 (uint) sizeof(struct sliccore_hdr));
5667 for (i = 0; i < max_queues; i++) { 5667 for (i = 0; i < max_queues; i++) {
5668 DBG_MSG("[slicmon] QUEUE 0x%x offset[%x] size[%x]\n", 5668 DBG_MSG("[slicmon] QUEUE 0x%x offset[%x] size[%x]\n",
5669 (uint) i, corehdr.queues[i].queueOff, 5669 (uint) i, corehdr.queues[i].queueOff,
@@ -5706,7 +5706,7 @@ static u32 slic_dump_resume(struct sliccard *card, unsigned char proc)
5706 5706
5707static u32 slic_dump_reg(struct sliccard *card, unsigned char proc) 5707static u32 slic_dump_reg(struct sliccard *card, unsigned char proc)
5708{ 5708{
5709 pdump_cmd_t dump = (pdump_cmd_t) card->cmdbuffer; 5709 struct dump_cmd *dump = (struct dump_cmd *)card->cmdbuffer;
5710 5710
5711 dump->cmd = COMMAND_BYTE(CMD_DUMP, 0, proc); 5711 dump->cmd = COMMAND_BYTE(CMD_DUMP, 0, proc);
5712 dump->desc = DESC_REG; 5712 dump->desc = DESC_REG;
@@ -5723,7 +5723,7 @@ static u32 slic_dump_reg(struct sliccard *card, unsigned char proc)
5723static u32 slic_dump_data(struct sliccard *card, 5723static u32 slic_dump_data(struct sliccard *card,
5724 u32 addr, ushort count, unsigned char desc) 5724 u32 addr, ushort count, unsigned char desc)
5725{ 5725{
5726 pdump_cmd_t dump = (pdump_cmd_t) card->cmdbuffer; 5726 struct dump_cmd *dump = (struct dump_cmd *)card->cmdbuffer;
5727 5727
5728 dump->cmd = COMMAND_BYTE(CMD_DUMP, 0, PROC_RECEIVE); 5728 dump->cmd = COMMAND_BYTE(CMD_DUMP, 0, PROC_RECEIVE);
5729 dump->desc = desc; 5729 dump->desc = desc;
@@ -5740,7 +5740,7 @@ static u32 slic_dump_data(struct sliccard *card,
5740static u32 slic_dump_queue(struct sliccard *card, 5740static u32 slic_dump_queue(struct sliccard *card,
5741 u32 addr, u32 buf_physh, u32 queue) 5741 u32 addr, u32 buf_physh, u32 queue)
5742{ 5742{
5743 pdump_cmd_t dump = (pdump_cmd_t) card->cmdbuffer; 5743 struct dump_cmd *dump = (struct dump_cmd *)card->cmdbuffer;
5744 5744
5745 dump->cmd = COMMAND_BYTE(CMD_DUMP, 0, PROC_RECEIVE); 5745 dump->cmd = COMMAND_BYTE(CMD_DUMP, 0, PROC_RECEIVE);
5746 dump->desc = DESC_QUEUE; 5746 dump->desc = DESC_QUEUE;
@@ -5756,7 +5756,7 @@ static u32 slic_dump_queue(struct sliccard *card,
5756static u32 slic_dump_load_queue(struct sliccard *card, u32 data, 5756static u32 slic_dump_load_queue(struct sliccard *card, u32 data,
5757 u32 queue) 5757 u32 queue)
5758{ 5758{
5759 pdump_cmd_t load = (pdump_cmd_t) card->cmdbuffer; 5759 struct dump_cmd *load = (struct dump_cmd *) card->cmdbuffer;
5760 5760
5761 load->cmd = COMMAND_BYTE(CMD_LOAD, 0, PROC_RECEIVE); 5761 load->cmd = COMMAND_BYTE(CMD_LOAD, 0, PROC_RECEIVE);
5762 load->desc = DESC_QUEUE; 5762 load->desc = DESC_QUEUE;
@@ -5771,7 +5771,7 @@ static u32 slic_dump_load_queue(struct sliccard *card, u32 data,
5771static u32 slic_dump_cam(struct sliccard *card, 5771static u32 slic_dump_cam(struct sliccard *card,
5772 u32 addr, u32 count, unsigned char desc) 5772 u32 addr, u32 count, unsigned char desc)
5773{ 5773{
5774 pdump_cmd_t dump = (pdump_cmd_t) card->cmdbuffer; 5774 struct dump_cmd *dump = (struct dump_cmd *)card->cmdbuffer;
5775 5775
5776 dump->cmd = COMMAND_BYTE(CMD_CAM_OPS, 0, PROC_NONE); 5776 dump->cmd = COMMAND_BYTE(CMD_CAM_OPS, 0, PROC_NONE);
5777 dump->desc = desc; 5777 dump->desc = desc;