aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/broadcom
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2014-07-29 17:34:14 -0400
committerDavid S. Miller <davem@davemloft.net>2014-07-30 23:01:49 -0400
commit7fc527f96bc57a5cb87bf78e8535bb85ad372995 (patch)
tree4040d2b1f52059c01844e48cebb1ecdad6e6a813 /drivers/net/ethernet/broadcom
parent989e9ad0c40862003a6bd85b4a3db45d49246e09 (diff)
net: bcmgenet: correct spelling
Signed-off-by: Brian Norris <computersforpeace@gmail.com> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: David S. Miller <davem@davemloft.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom')
-rw-r--r--drivers/net/ethernet/broadcom/genet/bcmgenet.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 417ce68449a4..ce455aed5a2f 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -89,7 +89,7 @@ static inline void dmadesc_set_addr(struct bcmgenet_priv *priv,
89 89
90 /* Register writes to GISB bus can take couple hundred nanoseconds 90 /* Register writes to GISB bus can take couple hundred nanoseconds
91 * and are done for each packet, save these expensive writes unless 91 * and are done for each packet, save these expensive writes unless
92 * the platform is explicitely configured for 64-bits/LPAE. 92 * the platform is explicitly configured for 64-bits/LPAE.
93 */ 93 */
94#ifdef CONFIG_PHYS_ADDR_T_64BIT 94#ifdef CONFIG_PHYS_ADDR_T_64BIT
95 if (priv->hw_params->flags & GENET_HAS_40BITS) 95 if (priv->hw_params->flags & GENET_HAS_40BITS)
@@ -114,7 +114,7 @@ static inline dma_addr_t dmadesc_get_addr(struct bcmgenet_priv *priv,
114 114
115 /* Register writes to GISB bus can take couple hundred nanoseconds 115 /* Register writes to GISB bus can take couple hundred nanoseconds
116 * and are done for each packet, save these expensive writes unless 116 * and are done for each packet, save these expensive writes unless
117 * the platform is explicitely configured for 64-bits/LPAE. 117 * the platform is explicitly configured for 64-bits/LPAE.
118 */ 118 */
119#ifdef CONFIG_PHYS_ADDR_T_64BIT 119#ifdef CONFIG_PHYS_ADDR_T_64BIT
120 if (priv->hw_params->flags & GENET_HAS_40BITS) 120 if (priv->hw_params->flags & GENET_HAS_40BITS)
@@ -876,7 +876,7 @@ static void __bcmgenet_tx_reclaim(struct net_device *dev,
876 struct netdev_queue *txq; 876 struct netdev_queue *txq;
877 unsigned int c_index; 877 unsigned int c_index;
878 878
879 /* Compute how many buffers are transmited since last xmit call */ 879 /* Compute how many buffers are transmitted since last xmit call */
880 c_index = bcmgenet_tdma_ring_readl(priv, ring->index, TDMA_CONS_INDEX); 880 c_index = bcmgenet_tdma_ring_readl(priv, ring->index, TDMA_CONS_INDEX);
881 txq = netdev_get_tx_queue(dev, ring->queue); 881 txq = netdev_get_tx_queue(dev, ring->queue);
882 882
@@ -1005,7 +1005,7 @@ static int bcmgenet_xmit_single(struct net_device *dev,
1005 return 0; 1005 return 0;
1006} 1006}
1007 1007
1008/* Transmit a SKB fragement */ 1008/* Transmit a SKB fragment */
1009static int bcmgenet_xmit_frag(struct net_device *dev, 1009static int bcmgenet_xmit_frag(struct net_device *dev,
1010 skb_frag_t *frag, 1010 skb_frag_t *frag,
1011 u16 dma_desc_flags, 1011 u16 dma_desc_flags,
@@ -1481,7 +1481,7 @@ static int reset_umac(struct bcmgenet_priv *priv)
1481 1481
1482 if (timeout == 1000) { 1482 if (timeout == 1000) {
1483 dev_err(kdev, 1483 dev_err(kdev,
1484 "timeout waiting for MAC to come out of resetn\n"); 1484 "timeout waiting for MAC to come out of reset\n");
1485 return -ETIMEDOUT; 1485 return -ETIMEDOUT;
1486 } 1486 }
1487 1487
@@ -1534,7 +1534,7 @@ static int init_umac(struct bcmgenet_priv *priv)
1534 1534
1535 dev_dbg(kdev, "%s:Enabling RXDMA_BDONE interrupt\n", __func__); 1535 dev_dbg(kdev, "%s:Enabling RXDMA_BDONE interrupt\n", __func__);
1536 1536
1537 /* Monitor cable plug/unpluged event for internal PHY */ 1537 /* Monitor cable plug/unplugged event for internal PHY */
1538 if (phy_is_internal(priv->phydev)) { 1538 if (phy_is_internal(priv->phydev)) {
1539 cpu_mask_clear |= (UMAC_IRQ_LINK_DOWN | UMAC_IRQ_LINK_UP); 1539 cpu_mask_clear |= (UMAC_IRQ_LINK_DOWN | UMAC_IRQ_LINK_UP);
1540 } else if (priv->ext_phy) { 1540 } else if (priv->ext_phy) {
@@ -1709,7 +1709,7 @@ static void bcmgenet_init_multiq(struct net_device *dev)
1709 i * priv->hw_params->bds_cnt, 1709 i * priv->hw_params->bds_cnt,
1710 (i + 1) * priv->hw_params->bds_cnt); 1710 (i + 1) * priv->hw_params->bds_cnt);
1711 1711
1712 /* Configure ring as decriptor ring and setup priority */ 1712 /* Configure ring as descriptor ring and setup priority */
1713 ring_cfg |= 1 << i; 1713 ring_cfg |= 1 << i;
1714 dma_priority |= ((GENET_Q0_PRIORITY + i) << 1714 dma_priority |= ((GENET_Q0_PRIORITY + i) <<
1715 (GENET_MAX_MQ_CNT + 1) * i); 1715 (GENET_MAX_MQ_CNT + 1) * i);
@@ -1775,7 +1775,7 @@ static int bcmgenet_init_dma(struct bcmgenet_priv *priv)
1775 /* Init tDma */ 1775 /* Init tDma */
1776 bcmgenet_tdma_writel(priv, DMA_MAX_BURST_LENGTH, DMA_SCB_BURST_SIZE); 1776 bcmgenet_tdma_writel(priv, DMA_MAX_BURST_LENGTH, DMA_SCB_BURST_SIZE);
1777 1777
1778 /* Initialize commont TX ring structures */ 1778 /* Initialize common TX ring structures */
1779 priv->tx_bds = priv->base + priv->hw_params->tdma_offset; 1779 priv->tx_bds = priv->base + priv->hw_params->tdma_offset;
1780 priv->num_tx_bds = TOTAL_DESC; 1780 priv->num_tx_bds = TOTAL_DESC;
1781 priv->tx_cbs = kcalloc(priv->num_tx_bds, sizeof(struct enet_cb), 1781 priv->tx_cbs = kcalloc(priv->num_tx_bds, sizeof(struct enet_cb),
@@ -1857,7 +1857,7 @@ static irqreturn_t bcmgenet_isr1(int irq, void *dev_id)
1857 priv->irq1_stat = 1857 priv->irq1_stat =
1858 bcmgenet_intrl2_1_readl(priv, INTRL2_CPU_STAT) & 1858 bcmgenet_intrl2_1_readl(priv, INTRL2_CPU_STAT) &
1859 ~priv->int1_mask; 1859 ~priv->int1_mask;
1860 /* clear inerrupts*/ 1860 /* clear interrupts */
1861 bcmgenet_intrl2_1_writel(priv, priv->irq1_stat, INTRL2_CPU_CLEAR); 1861 bcmgenet_intrl2_1_writel(priv, priv->irq1_stat, INTRL2_CPU_CLEAR);
1862 1862
1863 netif_dbg(priv, intr, priv->dev, 1863 netif_dbg(priv, intr, priv->dev,
@@ -1885,7 +1885,7 @@ static irqreturn_t bcmgenet_isr0(int irq, void *dev_id)
1885 priv->irq0_stat = 1885 priv->irq0_stat =
1886 bcmgenet_intrl2_0_readl(priv, INTRL2_CPU_STAT) & 1886 bcmgenet_intrl2_0_readl(priv, INTRL2_CPU_STAT) &
1887 ~bcmgenet_intrl2_0_readl(priv, INTRL2_CPU_MASK_STATUS); 1887 ~bcmgenet_intrl2_0_readl(priv, INTRL2_CPU_MASK_STATUS);
1888 /* clear inerrupts*/ 1888 /* clear interrupts */
1889 bcmgenet_intrl2_0_writel(priv, priv->irq0_stat, INTRL2_CPU_CLEAR); 1889 bcmgenet_intrl2_0_writel(priv, priv->irq0_stat, INTRL2_CPU_CLEAR);
1890 1890
1891 netif_dbg(priv, intr, priv->dev, 1891 netif_dbg(priv, intr, priv->dev,
@@ -2244,7 +2244,7 @@ static void bcmgenet_set_rx_mode(struct net_device *dev)
2244 2244
2245 netif_dbg(priv, hw, dev, "%s: %08X\n", __func__, dev->flags); 2245 netif_dbg(priv, hw, dev, "%s: %08X\n", __func__, dev->flags);
2246 2246
2247 /* Promiscous mode */ 2247 /* Promiscuous mode */
2248 reg = bcmgenet_umac_readl(priv, UMAC_CMD); 2248 reg = bcmgenet_umac_readl(priv, UMAC_CMD);
2249 if (dev->flags & IFF_PROMISC) { 2249 if (dev->flags & IFF_PROMISC) {
2250 reg |= CMD_PROMISC; 2250 reg |= CMD_PROMISC;