From 123f9c22da489c5f1d61a739028fd4fe01f3fd4e Mon Sep 17 00:00:00 2001 From: dim Date: Sun, 1 Mar 2015 01:08:14 +0000 Subject: [PATCH] MFC r279312: Fix a number of -Wcast-qual warnings under sys/arm. No functional change. Submitted by: andrew git-svn-id: svn://svn.freebsd.org/base/stable/10@279467 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/arm/arm/disassem.c | 2 +- sys/arm/ti/am335x/am335x_scm_padconf.c | 4 ++-- sys/arm/ti/omap4/omap4_scm_padconf.c | 4 ++-- sys/arm/ti/ti_scm.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/arm/arm/disassem.c b/sys/arm/arm/disassem.c index 69b86822e..dbe533a4a 100644 --- a/sys/arm/arm/disassem.c +++ b/sys/arm/arm/disassem.c @@ -289,7 +289,7 @@ static void disassemble_printaddr(u_int address); vm_offset_t disasm(const disasm_interface_t *di, vm_offset_t loc, int altfmt) { - struct arm32_insn *i_ptr = (struct arm32_insn *)&arm32_i; + const struct arm32_insn *i_ptr = arm32_i; u_int insn; int matchp; diff --git a/sys/arm/ti/am335x/am335x_scm_padconf.c b/sys/arm/ti/am335x/am335x_scm_padconf.c index 7d4a9866d..3ea76b2a7 100644 --- a/sys/arm/ti/am335x/am335x_scm_padconf.c +++ b/sys/arm/ti/am335x/am335x_scm_padconf.c @@ -308,8 +308,8 @@ const struct ti_scm_padconf ti_padconf_devmap[] = { const struct ti_scm_device ti_scm_dev = { .padconf_muxmode_mask = 0x7, .padconf_sate_mask = 0x78, - .padstate = (struct ti_scm_padstate *) &ti_padstate_devmap, - .padconf = (struct ti_scm_padconf *) &ti_padconf_devmap, + .padstate = ti_padstate_devmap, + .padconf = ti_padconf_devmap, }; int diff --git a/sys/arm/ti/omap4/omap4_scm_padconf.c b/sys/arm/ti/omap4/omap4_scm_padconf.c index fce5ba2d5..f684d4242 100644 --- a/sys/arm/ti/omap4/omap4_scm_padconf.c +++ b/sys/arm/ti/omap4/omap4_scm_padconf.c @@ -352,8 +352,8 @@ const struct ti_scm_padconf ti_padconf_devmap[] = { const struct ti_scm_device ti_scm_dev = { .padconf_muxmode_mask = CONTROL_PADCONF_MUXMODE_MASK, .padconf_sate_mask = CONTROL_PADCONF_SATE_MASK, - .padstate = (struct ti_scm_padstate *) &ti_padstate_devmap, - .padconf = (struct ti_scm_padconf *) &ti_padconf_devmap, + .padstate = ti_padstate_devmap, + .padconf = ti_padconf_devmap, }; int diff --git a/sys/arm/ti/ti_scm.h b/sys/arm/ti/ti_scm.h index a2b11940c..39100bbc2 100644 --- a/sys/arm/ti/ti_scm.h +++ b/sys/arm/ti/ti_scm.h @@ -59,8 +59,8 @@ struct ti_scm_padstate { struct ti_scm_device { uint16_t padconf_muxmode_mask; uint16_t padconf_sate_mask; - struct ti_scm_padstate *padstate; - struct ti_scm_padconf *padconf; + const struct ti_scm_padstate *padstate; + const struct ti_scm_padconf *padconf; }; struct ti_scm_softc { -- 2.45.0