drm/nouveau: require reservations for nouveau_fence_sync and nouveau_bo_fence

[deliverable/linux.git] / drivers / atm / he.c

diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index aa6be2698669652ada3e9bbebf3ad597831b24ec..c39702bc279d44f747ae24ae07958d2899ac9bcd 100644 (file)
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -533,14 +533,13 @@ static void he_init_tx_lbfp(struct he_dev *he_dev)
 
 static int he_init_tpdrq(struct he_dev *he_dev)
 {
-       he_dev->tpdrq_base = pci_alloc_consistent(he_dev->pci_dev,
-               CONFIG_TPDRQ_SIZE * sizeof(struct he_tpdrq), &he_dev->tpdrq_phys);
+       he_dev->tpdrq_base = pci_zalloc_consistent(he_dev->pci_dev,
+                                                  CONFIG_TPDRQ_SIZE * sizeof(struct he_tpdrq),
+                                                  &he_dev->tpdrq_phys);
        if (he_dev->tpdrq_base == NULL) {
                hprintk("failed to alloc tpdrq\n");
                return -ENOMEM;
        }
-       memset(he_dev->tpdrq_base, 0,
-                               CONFIG_TPDRQ_SIZE * sizeof(struct he_tpdrq));
 
        he_dev->tpdrq_tail = he_dev->tpdrq_base;
        he_dev->tpdrq_head = he_dev->tpdrq_base;
@@ -804,13 +803,13 @@ static int he_init_group(struct he_dev *he_dev, int group)
                goto out_free_rbpl_virt;
        }
 
-       he_dev->rbpl_base = pci_alloc_consistent(he_dev->pci_dev,
-               CONFIG_RBPL_SIZE * sizeof(struct he_rbp), &he_dev->rbpl_phys);
+       he_dev->rbpl_base = pci_zalloc_consistent(he_dev->pci_dev,
+                                                 CONFIG_RBPL_SIZE * sizeof(struct he_rbp),
+                                                 &he_dev->rbpl_phys);
        if (he_dev->rbpl_base == NULL) {
                hprintk("failed to alloc rbpl_base\n");
                goto out_destroy_rbpl_pool;
        }
-       memset(he_dev->rbpl_base, 0, CONFIG_RBPL_SIZE * sizeof(struct he_rbp));
 
        INIT_LIST_HEAD(&he_dev->rbpl_outstanding);
 
@@ -843,13 +842,13 @@ static int he_init_group(struct he_dev *he_dev, int group)
 
        /* rx buffer ready queue */
 
-       he_dev->rbrq_base = pci_alloc_consistent(he_dev->pci_dev,
-               CONFIG_RBRQ_SIZE * sizeof(struct he_rbrq), &he_dev->rbrq_phys);
+       he_dev->rbrq_base = pci_zalloc_consistent(he_dev->pci_dev,
+                                                 CONFIG_RBRQ_SIZE * sizeof(struct he_rbrq),
+                                                 &he_dev->rbrq_phys);
        if (he_dev->rbrq_base == NULL) {
                hprintk("failed to allocate rbrq\n");
                goto out_free_rbpl;
        }
-       memset(he_dev->rbrq_base, 0, CONFIG_RBRQ_SIZE * sizeof(struct he_rbrq));
 
        he_dev->rbrq_head = he_dev->rbrq_base;
        he_writel(he_dev, he_dev->rbrq_phys, G0_RBRQ_ST + (group * 16));
@@ -867,13 +866,13 @@ static int he_init_group(struct he_dev *he_dev, int group)
 
        /* tx buffer ready queue */
 
-       he_dev->tbrq_base = pci_alloc_consistent(he_dev->pci_dev,
-               CONFIG_TBRQ_SIZE * sizeof(struct he_tbrq), &he_dev->tbrq_phys);
+       he_dev->tbrq_base = pci_zalloc_consistent(he_dev->pci_dev,
+                                                 CONFIG_TBRQ_SIZE * sizeof(struct he_tbrq),
+                                                 &he_dev->tbrq_phys);
        if (he_dev->tbrq_base == NULL) {
                hprintk("failed to allocate tbrq\n");
                goto out_free_rbpq_base;
        }
-       memset(he_dev->tbrq_base, 0, CONFIG_TBRQ_SIZE * sizeof(struct he_tbrq));
 
        he_dev->tbrq_head = he_dev->tbrq_base;
 
@@ -1460,13 +1459,13 @@ static int he_start(struct atm_dev *dev)
 
        /* host status page */
 
-       he_dev->hsp = pci_alloc_consistent(he_dev->pci_dev,
-                               sizeof(struct he_hsp), &he_dev->hsp_phys);
+       he_dev->hsp = pci_zalloc_consistent(he_dev->pci_dev,
+                                           sizeof(struct he_hsp),
+                                           &he_dev->hsp_phys);
        if (he_dev->hsp == NULL) {
                hprintk("failed to allocate host status page\n");
                return -ENOMEM;
        }
-       memset(he_dev->hsp, 0, sizeof(struct he_hsp));
        he_writel(he_dev, he_dev->hsp_phys, HSP_BA);
 
        /* initialize framer */