Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/arm Delete unused variables for new gcc.



details:   https://anonhg.NetBSD.org/src/rev/3559dfa5a224
branches:  trunk
changeset: 794270:3559dfa5a224
user:      htodd <htodd%NetBSD.org@localhost>
date:      Mon Mar 10 04:25:51 2014 +0000

description:
Delete unused variables for new gcc.

diffstat:

 sys/arch/arm/imx/imx51_axi.c       |   8 ++------
 sys/arch/arm/imx/imx51_tzic.c      |   9 ++-------
 sys/arch/arm/s3c2xx0/s3c24x0_lcd.c |  13 +++----------
 sys/arch/arm/s3c2xx0/sscom.c       |  14 ++++++++------
 4 files changed, 15 insertions(+), 29 deletions(-)

diffs (175 lines):

diff -r 438684ade7c8 -r 3559dfa5a224 sys/arch/arm/imx/imx51_axi.c
--- a/sys/arch/arm/imx/imx51_axi.c      Mon Mar 10 03:04:57 2014 +0000
+++ b/sys/arch/arm/imx/imx51_axi.c      Mon Mar 10 04:25:51 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx51_axi.c,v 1.3 2012/04/17 09:33:31 bsh Exp $        */
+/*     $NetBSD: imx51_axi.c,v 1.4 2014/03/10 04:25:51 htodd Exp $      */
 
 /*-
  * Copyright (c) 2010 SHIMIZU Ryo <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx51_axi.c,v 1.3 2012/04/17 09:33:31 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_axi.c,v 1.4 2014/03/10 04:25:51 htodd Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -95,10 +95,8 @@
 axi_critical_search(device_t parent, struct cfdata *cf,
     const int *ldesc __unused, void *aux)
 {
-       struct axi_softc *sc;
        struct axi_attach_args *aa;
 
-       sc = device_private(parent);
        aa = aux;
 
        if ((strcmp(cf->cf_name, "tzic") != 0) &&
@@ -125,10 +123,8 @@
 axi_search(device_t parent, struct cfdata *cf, const int *ldesc __unused,
     void *aux)
 {
-       struct axi_softc *sc;
        struct axi_attach_args *aa;
 
-       sc = device_private(parent);
        aa = aux;
 
        aa->aa_addr = cf->cf_loc[AXICF_ADDR];
diff -r 438684ade7c8 -r 3559dfa5a224 sys/arch/arm/imx/imx51_tzic.c
--- a/sys/arch/arm/imx/imx51_tzic.c     Mon Mar 10 03:04:57 2014 +0000
+++ b/sys/arch/arm/imx/imx51_tzic.c     Mon Mar 10 04:25:51 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx51_tzic.c,v 1.4 2011/07/28 02:07:42 uebayasi Exp $  */
+/*     $NetBSD: imx51_tzic.c,v 1.5 2014/03/10 04:25:51 htodd Exp $     */
 
 /*-
  * Copyright (c) 2010 SHIMIZU Ryo <ryo%nerv.org@localhost>
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx51_tzic.c,v 1.4 2011/07/28 02:07:42 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_tzic.c,v 1.5 2014/03/10 04:25:51 htodd Exp $");
 
 #define        _INTR_PRIVATE   /* for arm/pic/picvar.h */
 
@@ -258,19 +258,14 @@
 static void
 tzic_intr_init(struct tzic_softc * const tzic)
 {
-       uint32_t reg;
        int i;
 
        disable_interrupts(I32_bit|F32_bit);
 
-       reg = INTC_READ(tzic, TZIC_INTCNTL);
        INTC_WRITE(tzic, TZIC_INTCNTL, INTCNTL_NSEN_MASK|INTCNTL_NSEN|INTCNTL_EN);
-       reg = INTC_READ(tzic, TZIC_INTCNTL);
        INTC_WRITE(tzic, TZIC_PRIOMASK, SW_TO_HW_IPL(IPL_NONE));
-       reg = INTC_READ(tzic, TZIC_PRIOMASK);
 
        INTC_WRITE(tzic, TZIC_SYNCCTRL, 0x00);
-       reg = INTC_READ(tzic, TZIC_SYNCCTRL);
 
        /* route all interrupts to IRQ.  secure interrupts are for FIQ */
        for (i = 0; i < 4; i++)
diff -r 438684ade7c8 -r 3559dfa5a224 sys/arch/arm/s3c2xx0/s3c24x0_lcd.c
--- a/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c        Mon Mar 10 03:04:57 2014 +0000
+++ b/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c        Mon Mar 10 04:25:51 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c24x0_lcd.c,v 1.10 2012/10/27 17:17:40 chs Exp $ */
+/* $NetBSD: s3c24x0_lcd.c,v 1.11 2014/03/10 04:25:51 htodd Exp $ */
 
 /*
  * Copyright (c) 2004  Genetec Corporation.  All rights reserved.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c24x0_lcd.c,v 1.10 2012/10/27 17:17:40 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c24x0_lcd.c,v 1.11 2014/03/10 04:25:51 htodd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -310,14 +310,11 @@
     int virtual_width, int virtual_height, int depth)
 {
        struct s3c24x0_lcd_screen *scr = NULL;
-       int width, height;
        bus_size_t size;
-        int error, pallet_size;
+        int error;
        int busdma_flag = (cold ? BUS_DMA_NOWAIT : BUS_DMA_WAITOK) |
            BUS_DMA_WRITE;
        paddr_t align;
-       const struct s3c24x0_lcd_panel_info *panel_info = sc->panel_info;
-
 
 #if 0 /* Does this make any sense? */
 #ifdef DIAGNOSTIC
@@ -328,10 +325,6 @@
 #endif
 #endif
 
-       width = panel_info->panel_width;
-       height = panel_info->panel_height;
-       pallet_size = 0;
-
        switch (depth) {
        case 1: case 2: case 4: case 8:
                virtual_width = roundup(virtual_width, 16 / depth);
diff -r 438684ade7c8 -r 3559dfa5a224 sys/arch/arm/s3c2xx0/sscom.c
--- a/sys/arch/arm/s3c2xx0/sscom.c      Mon Mar 10 03:04:57 2014 +0000
+++ b/sys/arch/arm/s3c2xx0/sscom.c      Mon Mar 10 04:25:51 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sscom.c,v 1.39 2013/05/01 07:38:01 mlelstv Exp $ */
+/*     $NetBSD: sscom.c,v 1.40 2014/03/10 04:25:51 htodd Exp $ */
 
 /*
  * Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -98,7 +98,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sscom.c,v 1.39 2013/05/01 07:38:01 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sscom.c,v 1.40 2014/03/10 04:25:51 htodd Exp $");
 
 #include "opt_sscom.h"
 #include "opt_ddb.h"
@@ -1901,7 +1901,8 @@
 sscomcngetc(dev_t dev)
 {
        int s = splserial();
-       u_char stat, c;
+       u_char __attribute__((__unused__)) stat;
+       u_char c;
 
        /* got a character from reading things earlier */
        if (sscom_readaheadcount > 0) {
@@ -1923,7 +1924,7 @@
        c = sscom_getc(sscomconstag, sscomconsioh);
        stat = sscom_geterr(sscomconstag, sscomconsioh);
        {
-               int cn_trapped = 0; /* unused */
+               int __attribute__((__unused__))cn_trapped = 0;
 #ifdef DDB
                extern int db_active;
                if (!db_active)
@@ -1943,11 +1944,12 @@
        int s = splserial();
        int timo;
 
-       int cin, stat;
+       int cin;
+       int __attribute__((__unused__)) stat;
        if (sscom_readaheadcount < MAX_READAHEAD && 
            sscom_rxrdy(sscomconstag, sscomconsioh)) {
            
-               int cn_trapped = 0;
+               int __attribute__((__unused__))cn_trapped = 0;
                cin = sscom_getc(sscomconstag, sscomconsioh);
                stat = sscom_geterr(sscomconstag, sscomconsioh);
                cn_check_magic(dev, cin, sscom_cnm_state);



Home | Main Index | Thread Index | Old Index