Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm/dist remove unused variables



details:   https://anonhg.NetBSD.org/src/rev/82abde465ea4
branches:  trunk
changeset: 790583:82abde465ea4
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Oct 17 21:15:18 2013 +0000

description:
remove unused variables

diffstat:

 sys/external/bsd/drm/dist/bsd-core/drm_memory.c      |  3 +--
 sys/external/bsd/drm/dist/bsd-core/drm_vm.c          |  4 ----
 sys/external/bsd/drm/dist/bsd-core/via_dmablit.c     |  4 +---
 sys/external/bsd/drm/dist/shared-core/mga_state.c    |  2 --
 sys/external/bsd/drm/dist/shared-core/radeon_cs.c    |  3 +--
 sys/external/bsd/drm/dist/shared-core/radeon_state.c |  2 --
 sys/external/bsd/drm/dist/shared-core/via_dma.c      |  4 +---
 7 files changed, 4 insertions(+), 18 deletions(-)

diffs (147 lines):

diff -r f7467841cd54 -r 82abde465ea4 sys/external/bsd/drm/dist/bsd-core/drm_memory.c
--- a/sys/external/bsd/drm/dist/bsd-core/drm_memory.c   Thu Oct 17 21:15:00 2013 +0000
+++ b/sys/external/bsd/drm/dist/bsd-core/drm_memory.c   Thu Oct 17 21:15:18 2013 +0000
@@ -96,9 +96,8 @@
 drm_netbsd_ioremap(struct drm_device *dev, drm_local_map_t *map, int wc)
 {
        bus_space_handle_t h;
-       int i, reg, reason;
+       int i, reason;
        for(i = 0; i<DRM_MAX_PCI_RESOURCE; i++) {
-               reg = PCI_MAPREG_START + i*4;
 
                /* Does the requested mapping lie within this resource? */
                if ((dev->pci_map_data[i].maptype == PCI_MAPREG_TYPE_MEM ||
diff -r f7467841cd54 -r 82abde465ea4 sys/external/bsd/drm/dist/bsd-core/drm_vm.c
--- a/sys/external/bsd/drm/dist/bsd-core/drm_vm.c       Thu Oct 17 21:15:00 2013 +0000
+++ b/sys/external/bsd/drm/dist/bsd-core/drm_vm.c       Thu Oct 17 21:15:18 2013 +0000
@@ -44,7 +44,6 @@
        int error;
 #elif   defined(__NetBSD__)
        paddr_t phys;
-       unsigned long map_offs;
        int flags = 0;
 #endif
 
@@ -126,9 +125,6 @@
                return -1;
        }
        type = map->type;
-#if    defined(__NetBSD__)
-       map_offs = map->offset;
-#endif
        DRM_UNLOCK();
 
        switch (type) {
diff -r f7467841cd54 -r 82abde465ea4 sys/external/bsd/drm/dist/bsd-core/via_dmablit.c
--- a/sys/external/bsd/drm/dist/bsd-core/via_dmablit.c  Thu Oct 17 21:15:00 2013 +0000
+++ b/sys/external/bsd/drm/dist/bsd-core/via_dmablit.c  Thu Oct 17 21:15:18 2013 +0000
@@ -29,7 +29,7 @@
 /* $FreeBSD: src/sys/dev/drm/via_dmablit.c,v 1.6 2010/12/25 21:26:56 alc Exp $ */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: via_dmablit.c,v 1.1 2011/02/18 14:26:09 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: via_dmablit.c,v 1.2 2013/10/17 21:15:18 christos Exp $");
 
 /*
  * Unmaps the DMA mappings.
@@ -67,7 +67,6 @@
        unsigned descriptor_this_page = num_desc % vsg->descriptors_per_page;
        drm_via_descriptor_t *desc_ptr = vsg->desc_pages[cur_descriptor_page] +
                descriptor_this_page;
-       dma_addr_t next = vsg->chain_start;
 
        while(num_desc--) {
                if (descriptor_this_page-- == 0) {
@@ -76,7 +75,6 @@
                        desc_ptr = vsg->desc_pages[cur_descriptor_page] +
                                descriptor_this_page;
                }
-               next = (dma_addr_t) desc_ptr->next;
                desc_ptr--;
        }
 }
diff -r f7467841cd54 -r 82abde465ea4 sys/external/bsd/drm/dist/shared-core/mga_state.c
--- a/sys/external/bsd/drm/dist/shared-core/mga_state.c Thu Oct 17 21:15:00 2013 +0000
+++ b/sys/external/bsd/drm/dist/shared-core/mga_state.c Thu Oct 17 21:15:18 2013 +0000
@@ -979,7 +979,6 @@
        struct drm_device_dma *dma = dev->dma;
        drm_mga_private_t *dev_priv = dev->dev_private;
        struct drm_buf *buf;
-       drm_mga_buf_priv_t *buf_priv;
        drm_mga_iload_t *iload = data;
        DRM_DEBUG("\n");
 
@@ -996,7 +995,6 @@
                return -EINVAL;
 
        buf = dma->buflist[iload->idx];
-       buf_priv = buf->dev_private;
 
        if (mga_verify_iload(dev_priv, iload->dstorg, iload->length)) {
                mga_freelist_put(dev, buf);
diff -r f7467841cd54 -r 82abde465ea4 sys/external/bsd/drm/dist/shared-core/radeon_cs.c
--- a/sys/external/bsd/drm/dist/shared-core/radeon_cs.c Thu Oct 17 21:15:00 2013 +0000
+++ b/sys/external/bsd/drm/dist/shared-core/radeon_cs.c Thu Oct 17 21:15:18 2013 +0000
@@ -725,7 +725,6 @@
 
 static int r600_cs_parse(struct drm_radeon_cs_parser *parser)
 {
-       volatile int rb;
        struct drm_radeon_kernel_chunk *ib_chunk;
        /* scan the packet for various things */
        int count_dw = 0, size_dw;
@@ -765,7 +764,7 @@
        memcpy(parser->ib, ib_chunk->kdata, ib_chunk->length_dw * sizeof(uint32_t));
 
        /* read back last byte to flush WC buffers */
-       rb = readl(((vm_offset_t)parser->ib + (ib_chunk->length_dw-1) * sizeof(uint32_t)));
+       readl(((vm_offset_t)parser->ib + (ib_chunk->length_dw-1) * sizeof(uint32_t)));
 
        return 0;
 }
diff -r f7467841cd54 -r 82abde465ea4 sys/external/bsd/drm/dist/shared-core/radeon_state.c
--- a/sys/external/bsd/drm/dist/shared-core/radeon_state.c      Thu Oct 17 21:15:00 2013 +0000
+++ b/sys/external/bsd/drm/dist/shared-core/radeon_state.c      Thu Oct 17 21:15:18 2013 +0000
@@ -2315,7 +2315,6 @@
        struct drm_buf *buf;
        drm_radeon_indices_t *elts = data;
        drm_radeon_tcl_prim_t prim;
-       int count;
 
        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
@@ -2354,7 +2353,6 @@
                return -EINVAL;
        }
 
-       count = (elts->end - elts->start) / sizeof(u16);
        elts->start -= RADEON_INDEX_PRIM_OFFSET;
 
        if (elts->start & 0x7) {
diff -r f7467841cd54 -r 82abde465ea4 sys/external/bsd/drm/dist/shared-core/via_dma.c
--- a/sys/external/bsd/drm/dist/shared-core/via_dma.c   Thu Oct 17 21:15:00 2013 +0000
+++ b/sys/external/bsd/drm/dist/shared-core/via_dma.c   Thu Oct 17 21:15:18 2013 +0000
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: via_dma.c,v 1.3 2011/02/18 14:26:10 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: via_dma.c,v 1.4 2013/10/17 21:15:18 christos Exp $");
 
 #include "drmP.h"
 #include "drm.h"
@@ -610,13 +610,11 @@
 
 static void via_cmdbuf_jump(drm_via_private_t * dev_priv)
 {
-       uint32_t agp_base;
        uint32_t pause_addr_lo, pause_addr_hi;
        uint32_t jump_addr_lo, jump_addr_hi;
        volatile uint32_t *last_pause_ptr;
        uint32_t dma_low_save1, dma_low_save2;
 
-       agp_base = dev_priv->dma_offset + (uint32_t) dev_priv->agpAddr;
        via_align_cmd(dev_priv, HC_HAGPBpID_JUMP, 0, &jump_addr_hi,
                      &jump_addr_lo, 0);
 



Home | Main Index | Thread Index | Old Index