diff options
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c')
-rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c index 2c431b616058..0c2058a69fd2 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c | |||
@@ -116,7 +116,7 @@ static void dwmac1000_dma_operation_mode(void __iomem *ioaddr, int txmode, | |||
116 | u32 csr6 = readl(ioaddr + DMA_CONTROL); | 116 | u32 csr6 = readl(ioaddr + DMA_CONTROL); |
117 | 117 | ||
118 | if (txmode == SF_DMA_MODE) { | 118 | if (txmode == SF_DMA_MODE) { |
119 | CHIP_DBG(KERN_DEBUG "GMAC: enable TX store and forward mode\n"); | 119 | pr_debug("GMAC: enable TX store and forward mode\n"); |
120 | /* Transmit COE type 2 cannot be done in cut-through mode. */ | 120 | /* Transmit COE type 2 cannot be done in cut-through mode. */ |
121 | csr6 |= DMA_CONTROL_TSF; | 121 | csr6 |= DMA_CONTROL_TSF; |
122 | /* Operating on second frame increase the performance | 122 | /* Operating on second frame increase the performance |
@@ -124,8 +124,7 @@ static void dwmac1000_dma_operation_mode(void __iomem *ioaddr, int txmode, | |||
124 | */ | 124 | */ |
125 | csr6 |= DMA_CONTROL_OSF; | 125 | csr6 |= DMA_CONTROL_OSF; |
126 | } else { | 126 | } else { |
127 | CHIP_DBG(KERN_DEBUG "GMAC: disabling TX SF (threshold %d)\n", | 127 | pr_debug("GMAC: disabling TX SF (threshold %d)\n", txmode); |
128 | txmode); | ||
129 | csr6 &= ~DMA_CONTROL_TSF; | 128 | csr6 &= ~DMA_CONTROL_TSF; |
130 | csr6 &= DMA_CONTROL_TC_TX_MASK; | 129 | csr6 &= DMA_CONTROL_TC_TX_MASK; |
131 | /* Set the transmit threshold */ | 130 | /* Set the transmit threshold */ |
@@ -142,11 +141,10 @@ static void dwmac1000_dma_operation_mode(void __iomem *ioaddr, int txmode, | |||
142 | } | 141 | } |
143 | 142 | ||
144 | if (rxmode == SF_DMA_MODE) { | 143 | if (rxmode == SF_DMA_MODE) { |
145 | CHIP_DBG(KERN_DEBUG "GMAC: enable RX store and forward mode\n"); | 144 | pr_debug("GMAC: enable RX store and forward mode\n"); |
146 | csr6 |= DMA_CONTROL_RSF; | 145 | csr6 |= DMA_CONTROL_RSF; |
147 | } else { | 146 | } else { |
148 | CHIP_DBG(KERN_DEBUG "GMAC: disable RX SF mode (threshold %d)\n", | 147 | pr_debug("GMAC: disable RX SF mode (threshold %d)\n", rxmode); |
149 | rxmode); | ||
150 | csr6 &= ~DMA_CONTROL_RSF; | 148 | csr6 &= ~DMA_CONTROL_RSF; |
151 | csr6 &= DMA_CONTROL_TC_RX_MASK; | 149 | csr6 &= DMA_CONTROL_TC_RX_MASK; |
152 | if (rxmode <= 32) | 150 | if (rxmode <= 32) |