073-v5.12-0006-net-broadcom-bcm4908_enet-fix-minor-typos.patch 2.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960
  1. From e3948811720341f99cd5cb4a8a650473400ec4f8 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <[email protected]>
  3. Date: Thu, 11 Feb 2021 13:12:37 +0100
  4. Subject: [PATCH] net: broadcom: bcm4908_enet: fix minor typos
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. 1. Fix "ensable" typo noticed by Andrew
  9. 2. Fix chipset name in the struct net_device_ops variable
  10. Suggested-by: Andrew Lunn <[email protected]>
  11. Signed-off-by: Rafał Miłecki <[email protected]>
  12. Reviewed-by: Andrew Lunn <[email protected]>
  13. Reviewed-by: Florian Fainelli <[email protected]>
  14. Signed-off-by: David S. Miller <[email protected]>
  15. ---
  16. drivers/net/ethernet/broadcom/bcm4908_enet.c | 10 +++++-----
  17. 1 file changed, 5 insertions(+), 5 deletions(-)
  18. --- a/drivers/net/ethernet/broadcom/bcm4908_enet.c
  19. +++ b/drivers/net/ethernet/broadcom/bcm4908_enet.c
  20. @@ -328,8 +328,8 @@ static int bcm4908_enet_dma_init(struct
  21. return 0;
  22. }
  23. -static void bcm4908_enet_dma_tx_ring_ensable(struct bcm4908_enet *enet,
  24. - struct bcm4908_enet_dma_ring *ring)
  25. +static void bcm4908_enet_dma_tx_ring_enable(struct bcm4908_enet *enet,
  26. + struct bcm4908_enet_dma_ring *ring)
  27. {
  28. enet_write(enet, ring->cfg_block + ENET_DMA_CH_CFG, ENET_DMA_CH_CFG_ENABLE);
  29. }
  30. @@ -519,7 +519,7 @@ static int bcm4908_enet_start_xmit(struc
  31. buf_desc->addr = cpu_to_le32((uint32_t)slot->dma_addr);
  32. buf_desc->ctl = cpu_to_le32(tmp);
  33. - bcm4908_enet_dma_tx_ring_ensable(enet, &enet->tx_ring);
  34. + bcm4908_enet_dma_tx_ring_enable(enet, &enet->tx_ring);
  35. if (++ring->write_idx == ring->length - 1)
  36. ring->write_idx = 0;
  37. @@ -583,7 +583,7 @@ static int bcm4908_enet_poll(struct napi
  38. return handled;
  39. }
  40. -static const struct net_device_ops bcm96xx_netdev_ops = {
  41. +static const struct net_device_ops bcm4908_enet_netdev_ops = {
  42. .ndo_open = bcm4908_enet_open,
  43. .ndo_stop = bcm4908_enet_stop,
  44. .ndo_start_xmit = bcm4908_enet_start_xmit,
  45. @@ -623,7 +623,7 @@ static int bcm4908_enet_probe(struct pla
  46. SET_NETDEV_DEV(netdev, &pdev->dev);
  47. eth_hw_addr_random(netdev);
  48. - netdev->netdev_ops = &bcm96xx_netdev_ops;
  49. + netdev->netdev_ops = &bcm4908_enet_netdev_ops;
  50. netdev->min_mtu = ETH_ZLEN;
  51. netdev->mtu = ENET_MTU_MAX;
  52. netdev->max_mtu = ENET_MTU_MAX;