svn commit: r279467 - in stable: 10/sys/arm/arm 10/sys/arm/ti 10/sys/arm/ti/am335x 10/sys/arm/ti/omap4 9/sys/arm/arm

[Dimitry Andric]

Author: dim
Date: Sun Mar  1 01:08:14 2015
New Revision: 279467
URL: https://svnweb.freebsd.org/changeset/base/279467

Log:
  MFC r279312:
  
  Fix a number of -Wcast-qual warnings under sys/arm.  No functional
  change.
  
  Submitted by:	andrew

Modified:
  stable/10/sys/arm/arm/disassem.c
  stable/10/sys/arm/ti/am335x/am335x_scm_padconf.c
  stable/10/sys/arm/ti/omap4/omap4_scm_padconf.c
  stable/10/sys/arm/ti/ti_scm.h
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/9/sys/arm/arm/disassem.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/10/sys/arm/arm/disassem.c
==============================================================================
--- stable/10/sys/arm/arm/disassem.c	Sun Mar  1 00:59:35 2015	(r279466)
+++ stable/10/sys/arm/arm/disassem.c	Sun Mar  1 01:08:14 2015	(r279467)
@@ -289,7 +289,7 @@ static void disassemble_printaddr(u_int 
 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;

Modified: stable/10/sys/arm/ti/am335x/am335x_scm_padconf.c
==============================================================================
--- stable/10/sys/arm/ti/am335x/am335x_scm_padconf.c	Sun Mar  1 00:59:35 2015	(r279466)
+++ stable/10/sys/arm/ti/am335x/am335x_scm_padconf.c	Sun Mar  1 01:08:14 2015	(r279467)
@@ -308,8 +308,8 @@ const struct ti_scm_padconf ti_padconf_d
 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

Modified: stable/10/sys/arm/ti/omap4/omap4_scm_padconf.c
==============================================================================
--- stable/10/sys/arm/ti/omap4/omap4_scm_padconf.c	Sun Mar  1 00:59:35 2015	(r279466)
+++ stable/10/sys/arm/ti/omap4/omap4_scm_padconf.c	Sun Mar  1 01:08:14 2015	(r279467)
@@ -352,8 +352,8 @@ const struct ti_scm_padconf ti_padconf_d
 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

Modified: stable/10/sys/arm/ti/ti_scm.h
==============================================================================
--- stable/10/sys/arm/ti/ti_scm.h	Sun Mar  1 00:59:35 2015	(r279466)
+++ stable/10/sys/arm/ti/ti_scm.h	Sun Mar  1 01:08:14 2015	(r279467)
@@ -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 {