diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-02-25 20:29:34 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 17:53:05 -0400 |
commit | 5969ca00a23f1bda0d9f3679b760cb6fc7480788 (patch) | |
tree | bf20c1061399c4ad0747daa8018d96685daf12df /drivers/staging/slicoss | |
parent | db7a673a66cb860f6b9eab4d14331480608ab8f7 (diff) |
Staging: slicoss: remove DEBUG_REGISTER_TRACE
It's not ever defined, so remove it from the code base.
Cc: Lior Dotan <liodot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/slicoss')
-rw-r--r-- | drivers/staging/slicoss/slic_os.h | 27 | ||||
-rw-r--r-- | drivers/staging/slicoss/slicoss.c | 15 |
2 files changed, 0 insertions, 42 deletions
diff --git a/drivers/staging/slicoss/slic_os.h b/drivers/staging/slicoss/slic_os.h index bcc61d5f938..d5fab0ce9f6 100644 --- a/drivers/staging/slicoss/slic_os.h +++ b/drivers/staging/slicoss/slic_os.h | |||
@@ -42,37 +42,10 @@ | |||
42 | #ifndef _SLIC_OS_SPECIFIC_H_ | 42 | #ifndef _SLIC_OS_SPECIFIC_H_ |
43 | #define _SLIC_OS_SPECIFIC_H_ | 43 | #define _SLIC_OS_SPECIFIC_H_ |
44 | 44 | ||
45 | #ifdef DEBUG_REGISTER_TRACE | ||
46 | #define WRITE_REG(reg, value, flush) \ | ||
47 | { \ | ||
48 | adapter->card->reg_type[adapter->card->debug_ix] = 0; \ | ||
49 | adapter->card->reg_offset[adapter->card->debug_ix] = \ | ||
50 | ((unsigned char *)(®)) - \ | ||
51 | ((unsigned char *)adapter->slic_regs); \ | ||
52 | adapter->card->reg_value[adapter->card->debug_ix++] = value; \ | ||
53 | if (adapter->card->debug_ix == 32) \ | ||
54 | adapter->card->debug_ix = 0; \ | ||
55 | slic_reg32_write((®), (value), (flush)); \ | ||
56 | } | ||
57 | #define WRITE_REG64(a, reg, value, regh, valh, flush) \ | ||
58 | { \ | ||
59 | adapter->card->reg_type[adapter->card->debug_ix] = 1; \ | ||
60 | adapter->card->reg_offset[adapter->card->debug_ix] = \ | ||
61 | ((unsigned char *)(®)) - \ | ||
62 | ((unsigned char *)adapter->slic_regs); \ | ||
63 | adapter->card->reg_value[adapter->card->debug_ix] = value; \ | ||
64 | adapter->card->reg_valueh[adapter->card->debug_ix++] = valh; \ | ||
65 | if (adapter->card->debug_ix == 32) \ | ||
66 | adapter->card->debug_ix = 0; \ | ||
67 | slic_reg64_write((a), (®), (value), (®h), (valh), \ | ||
68 | (flush));\ | ||
69 | } | ||
70 | #else | ||
71 | #define WRITE_REG(reg, value, flush) \ | 45 | #define WRITE_REG(reg, value, flush) \ |
72 | slic_reg32_write((®), (value), (flush)) | 46 | slic_reg32_write((®), (value), (flush)) |
73 | #define WRITE_REG64(a, reg, value, regh, valh, flush) \ | 47 | #define WRITE_REG64(a, reg, value, regh, valh, flush) \ |
74 | slic_reg64_write((a), (®), (value), (®h), (valh), (flush)) | 48 | slic_reg64_write((a), (®), (value), (®h), (valh), (flush)) |
75 | #endif | ||
76 | 49 | ||
77 | #endif /* _SLIC_OS_SPECIFIC_H_ */ | 50 | #endif /* _SLIC_OS_SPECIFIC_H_ */ |
78 | 51 | ||
diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c index 283156acdd5..73d4d25e174 100644 --- a/drivers/staging/slicoss/slicoss.c +++ b/drivers/staging/slicoss/slicoss.c | |||
@@ -245,21 +245,6 @@ static void slic_dbg_macaddrs(struct adapter *adapter) | |||
245 | return; | 245 | return; |
246 | } | 246 | } |
247 | 247 | ||
248 | #ifdef DEBUG_REGISTER_TRACE | ||
249 | static void slic_dbg_register_trace(struct adapter *adapter, | ||
250 | struct sliccard *card) | ||
251 | { | ||
252 | uint i; | ||
253 | |||
254 | DBG_ERROR("Dump Register Write Trace: curr_ix == %d\n", card->debug_ix); | ||
255 | for (i = 0; i < 32; i++) { | ||
256 | DBG_ERROR("%2d %d %4x %x %x\n", | ||
257 | i, card->reg_type[i], card->reg_offset[i], | ||
258 | card->reg_value[i], card->reg_valueh[i]); | ||
259 | } | ||
260 | } | ||
261 | #endif | ||
262 | |||
263 | static void slic_init_adapter(struct net_device *netdev, | 248 | static void slic_init_adapter(struct net_device *netdev, |
264 | struct pci_dev *pcidev, | 249 | struct pci_dev *pcidev, |
265 | const struct pci_device_id *pci_tbl_entry, | 250 | const struct pci_device_id *pci_tbl_entry, |