diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-17 03:10:17 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-17 03:10:17 -0400 |
| commit | edb4dcb717d71f63c5147d7bef3014f96d192842 (patch) | |
| tree | 95e30d8f86935a2444391d388720f4f19f3d89f7 | |
| parent | e60c5e14fbfcaa54f430aad80b38763a403b2158 (diff) | |
atm: idt77252: Fix set-but-unused variables.
Two cases here:
1) idt77252_rx_raw() really does not make any use of the
extracted PTI field of the atm header.
2) idt77252_collect_stat() only uses the register values
in code which has been compiled out by a "NOTDEF" cpp
test for more than 10 years. Just kill this NOTDEF
code entirely, but keep the register reads in case
they have side effects.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/atm/idt77252.c | 52 |
1 files changed, 4 insertions, 48 deletions
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c index 048f99fe6f83..1f8d724a18bf 100644 --- a/drivers/atm/idt77252.c +++ b/drivers/atm/idt77252.c | |||
| @@ -1261,14 +1261,13 @@ idt77252_rx_raw(struct idt77252_dev *card) | |||
| 1261 | PCI_DMA_FROMDEVICE); | 1261 | PCI_DMA_FROMDEVICE); |
| 1262 | 1262 | ||
| 1263 | while (head != tail) { | 1263 | while (head != tail) { |
| 1264 | unsigned int vpi, vci, pti; | 1264 | unsigned int vpi, vci; |
| 1265 | u32 header; | 1265 | u32 header; |
| 1266 | 1266 | ||
| 1267 | header = le32_to_cpu(*(u32 *) &queue->data[0]); | 1267 | header = le32_to_cpu(*(u32 *) &queue->data[0]); |
| 1268 | 1268 | ||
| 1269 | vpi = (header & ATM_HDR_VPI_MASK) >> ATM_HDR_VPI_SHIFT; | 1269 | vpi = (header & ATM_HDR_VPI_MASK) >> ATM_HDR_VPI_SHIFT; |
| 1270 | vci = (header & ATM_HDR_VCI_MASK) >> ATM_HDR_VCI_SHIFT; | 1270 | vci = (header & ATM_HDR_VCI_MASK) >> ATM_HDR_VCI_SHIFT; |
| 1271 | pti = (header & ATM_HDR_PTI_MASK) >> ATM_HDR_PTI_SHIFT; | ||
| 1272 | 1271 | ||
| 1273 | #ifdef CONFIG_ATM_IDT77252_DEBUG | 1272 | #ifdef CONFIG_ATM_IDT77252_DEBUG |
| 1274 | if (debug & DBG_RAW_CELL) { | 1273 | if (debug & DBG_RAW_CELL) { |
| @@ -2709,53 +2708,10 @@ idt77252_proc_read(struct atm_dev *dev, loff_t * pos, char *page) | |||
| 2709 | static void | 2708 | static void |
| 2710 | idt77252_collect_stat(struct idt77252_dev *card) | 2709 | idt77252_collect_stat(struct idt77252_dev *card) |
| 2711 | { | 2710 | { |
| 2712 | u32 cdc, vpec, icc; | 2711 | (void) readl(SAR_REG_CDC); |
| 2712 | (void) readl(SAR_REG_VPEC); | ||
| 2713 | (void) readl(SAR_REG_ICC); | ||
| 2713 | 2714 | ||
| 2714 | cdc = readl(SAR_REG_CDC); | ||
| 2715 | vpec = readl(SAR_REG_VPEC); | ||
| 2716 | icc = readl(SAR_REG_ICC); | ||
| 2717 | |||
| 2718 | #ifdef NOTDEF | ||
| 2719 | printk("%s:", card->name); | ||
| 2720 | |||
| 2721 | if (cdc & 0x7f0000) { | ||
| 2722 | char *s = ""; | ||
| 2723 | |||
| 2724 | printk(" ["); | ||
| 2725 | if (cdc & (1 << 22)) { | ||
| 2726 | printk("%sRM ID", s); | ||
| 2727 | s = " | "; | ||
| 2728 | } | ||
| 2729 | if (cdc & (1 << 21)) { | ||
| 2730 | printk("%sCON TAB", s); | ||
| 2731 | s = " | "; | ||
| 2732 | } | ||
| 2733 | if (cdc & (1 << 20)) { | ||
| 2734 | printk("%sNO FB", s); | ||
| 2735 | s = " | "; | ||
| 2736 | } | ||
| 2737 | if (cdc & (1 << 19)) { | ||
| 2738 | printk("%sOAM CRC", s); | ||
| 2739 | s = " | "; | ||
| 2740 | } | ||
| 2741 | if (cdc & (1 << 18)) { | ||
| 2742 | printk("%sRM CRC", s); | ||
| 2743 | s = " | "; | ||
| 2744 | } | ||
| 2745 | if (cdc & (1 << 17)) { | ||
| 2746 | printk("%sRM FIFO", s); | ||
| 2747 | s = " | "; | ||
| 2748 | } | ||
| 2749 | if (cdc & (1 << 16)) { | ||
| 2750 | printk("%sRX FIFO", s); | ||
| 2751 | s = " | "; | ||
| 2752 | } | ||
| 2753 | printk("]"); | ||
| 2754 | } | ||
| 2755 | |||
| 2756 | printk(" CDC %04x, VPEC %04x, ICC: %04x\n", | ||
| 2757 | cdc & 0xffff, vpec & 0xffff, icc & 0xffff); | ||
| 2758 | #endif | ||
| 2759 | } | 2715 | } |
| 2760 | 2716 | ||
| 2761 | static irqreturn_t | 2717 | static irqreturn_t |
