e1000: ROUND_UP macro cleanup in drivers/net/e1000

E1000_ROUNDUP macro cleanup, use ALIGN

Signed-off-by: Milind Arun Choudhary <milindchoudhary@gmail.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 2881da1c6fe3..bb08375b5f13 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -683,12 +683,12 @@ e1000_set_ringparam(struct net_device *netdev,
         rxdr->count = max(ring->rx_pending,(uint32_t)E1000_MIN_RXD);
         rxdr->count = min(rxdr->count,(uint32_t)(mac_type < e1000_82544 ?
                 E1000_MAX_RXD : E1000_MAX_82544_RXD));
-        E1000_ROUNDUP(rxdr->count, REQ_RX_DESCRIPTOR_MULTIPLE);
+        rxdr->count = ALIGN(rxdr->count, REQ_RX_DESCRIPTOR_MULTIPLE);
 
         txdr->count = max(ring->tx_pending,(uint32_t)E1000_MIN_TXD);
         txdr->count = min(txdr->count,(uint32_t)(mac_type < e1000_82544 ?
                 E1000_MAX_TXD : E1000_MAX_82544_TXD));
-        E1000_ROUNDUP(txdr->count, REQ_TX_DESCRIPTOR_MULTIPLE);
+        txdr->count = ALIGN(txdr->count, REQ_TX_DESCRIPTOR_MULTIPLE);
 
         for (i = 0; i < adapter->num_tx_queues; i++)
                 txdr[i].count = txdr->count;
@@ -1065,7 +1065,7 @@ e1000_setup_desc_rings(struct e1000_adapter *adapter)
         }
 
         txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
-        E1000_ROUNDUP(txdr->size, 4096);
+        txdr->size = ALIGN(txdr->size, 4096);
         if (!(txdr->desc = pci_alloc_consistent(pdev, txdr->size,
                                                 &txdr->dma))) {
                 ret_val = 2;