]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: et131x: Remove incorrect comments regarding alignment
authorMark Einon <mark.einon@gmail.com>
Fri, 16 Nov 2012 10:47:40 +0000 (10:47 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 21 Nov 2012 21:57:28 +0000 (13:57 -0800)
A previous change removed code that aligned memory returned from
dma_alloc_coherent() to a 4k boundary, which was not necessary.

Some comments regarding this alignment still exist, so remove them
as they no longer apply.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/et131x/et131x.c

index 9ccd9b7f2fbe8613c7d2180197d8fd4e9433c825..703a874996aaca1af02f498b55d101242424eaf1 100644 (file)
@@ -2310,13 +2310,6 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
                for (i = 0; i < (rx_ring->fbr[id]->num_entries / FBR_CHUNKS); i++) {
                        dma_addr_t fbr_tmp_physaddr;
 
-                       /* This code allocates an area of memory big enough for
-                        * N free buffers + (buffer_size - 1) so that the
-                        * buffers can be aligned on 4k boundaries.  If each
-                        * buffer were aligned to a buffer_size boundary, the
-                        * effect would be to double the size of FBR0. By
-                        * allocating N buffers at once, we reduce this overhead
-                        */
                        rx_ring->fbr[id]->mem_virtaddrs[i] = dma_alloc_coherent(
                                        &adapter->pdev->dev, fbr_chunksize,
                                        &rx_ring->fbr[id]->mem_physaddrs[i],
@@ -2901,9 +2894,6 @@ static int et131x_tx_dma_memory_alloc(struct et131x_adapter *adapter)
                return -ENOMEM;
        }
 
-       /* Allocate enough memory for the Tx descriptor ring, and allocate
-        * some extra so that the ring can be aligned on a 4k boundary.
-        */
        desc_size = (sizeof(struct tx_desc) * NUM_DESC_PER_RING_TX);
        tx_ring->tx_desc_ring =
            (struct tx_desc *) dma_alloc_coherent(&adapter->pdev->dev,