1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
index 4345332533ad..2326579f9454 100644
--- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
@@ -35,7 +35,7 @@ char atl1e_driver_version[] = DRV_VERSION;
  * { Vendor ID, Device ID, SubVendor ID, SubDevice ID,
  *   Class, Class Mask, private data (not used) }
  */
-static DEFINE_PCI_DEVICE_TABLE(atl1e_pci_tbl) = {
+static const struct pci_device_id atl1e_pci_tbl[] = {
         {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L1E)},
         {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, 0x1066)},
         /* required last entry */
@@ -831,17 +831,14 @@ static int atl1e_setup_ring_resources(struct atl1e_adapter *adapter)
         /* real ring DMA buffer */
 
         size = adapter->ring_size;
-        adapter->ring_vir_addr = pci_alloc_consistent(pdev,
-                        adapter->ring_size, &adapter->ring_dma);
-
+        adapter->ring_vir_addr = pci_zalloc_consistent(pdev, adapter->ring_size,
+                                                       &adapter->ring_dma);
         if (adapter->ring_vir_addr == NULL) {
                 netdev_err(adapter->netdev,
                            "pci_alloc_consistent failed, size = D%d\n", size);
                 return -ENOMEM;
         }
 
-        memset(adapter->ring_vir_addr, 0, adapter->ring_size);
-
         rx_page_desc = rx_ring->rx_page_desc;
 
         /* Init TPD Ring */