Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 31 Jan 2015 22:18:53 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r278004 - head/sys/dev/drm2/radeon
Message-ID:  <201501312218.t0VMIr7m035695@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: dim
Date: Sat Jan 31 22:18:52 2015
New Revision: 278004
URL: https://svnweb.freebsd.org/changeset/base/278004

Log:
  Constify a number of accesses in drm2's radeon drivers to avoid
  -Wcast-qual warnings.  No functional change.
  
  Reviewed by:	dumbbell
  MFC after:	3 days
  Differential Revision: https://reviews.freebsd.org/D1727

Modified:
  head/sys/dev/drm2/radeon/ni.c
  head/sys/dev/drm2/radeon/si.c

Modified: head/sys/dev/drm2/radeon/ni.c
==============================================================================
--- head/sys/dev/drm2/radeon/ni.c	Sat Jan 31 22:07:38 2015	(r278003)
+++ head/sys/dev/drm2/radeon/ni.c	Sat Jan 31 22:18:52 2015	(r278004)
@@ -182,7 +182,7 @@ int ni_mc_load_microcode(struct radeon_d
 {
 	const __be32 *fw_data;
 	u32 mem_type, running, blackout = 0;
-	u32 *io_mc_regs;
+	const u32 *io_mc_regs;
 	int i, ucode_size, regs_size;
 
 	if (!rdev->mc_fw)
@@ -190,23 +190,23 @@ int ni_mc_load_microcode(struct radeon_d
 
 	switch (rdev->family) {
 	case CHIP_BARTS:
-		io_mc_regs = (u32 *)&barts_io_mc_regs;
+		io_mc_regs = (const u32 *)&barts_io_mc_regs;
 		ucode_size = BTC_MC_UCODE_SIZE;
 		regs_size = BTC_IO_MC_REGS_SIZE;
 		break;
 	case CHIP_TURKS:
-		io_mc_regs = (u32 *)&turks_io_mc_regs;
+		io_mc_regs = (const u32 *)&turks_io_mc_regs;
 		ucode_size = BTC_MC_UCODE_SIZE;
 		regs_size = BTC_IO_MC_REGS_SIZE;
 		break;
 	case CHIP_CAICOS:
 	default:
-		io_mc_regs = (u32 *)&caicos_io_mc_regs;
+		io_mc_regs = (const u32 *)&caicos_io_mc_regs;
 		ucode_size = BTC_MC_UCODE_SIZE;
 		regs_size = BTC_IO_MC_REGS_SIZE;
 		break;
 	case CHIP_CAYMAN:
-		io_mc_regs = (u32 *)&cayman_io_mc_regs;
+		io_mc_regs = (const u32 *)&cayman_io_mc_regs;
 		ucode_size = CAYMAN_MC_UCODE_SIZE;
 		regs_size = BTC_IO_MC_REGS_SIZE;
 		break;

Modified: head/sys/dev/drm2/radeon/si.c
==============================================================================
--- head/sys/dev/drm2/radeon/si.c	Sat Jan 31 22:07:38 2015	(r278003)
+++ head/sys/dev/drm2/radeon/si.c	Sat Jan 31 22:18:52 2015	(r278004)
@@ -182,7 +182,7 @@ static int si_mc_load_microcode(struct r
 {
 	const __be32 *fw_data;
 	u32 running, blackout = 0;
-	u32 *io_mc_regs;
+	const u32 *io_mc_regs;
 	int i, ucode_size, regs_size;
 
 	if (!rdev->mc_fw)
@@ -190,18 +190,18 @@ static int si_mc_load_microcode(struct r
 
 	switch (rdev->family) {
 	case CHIP_TAHITI:
-		io_mc_regs = (u32 *)&tahiti_io_mc_regs;
+		io_mc_regs = (const u32 *)&tahiti_io_mc_regs;
 		ucode_size = SI_MC_UCODE_SIZE;
 		regs_size = TAHITI_IO_MC_REGS_SIZE;
 		break;
 	case CHIP_PITCAIRN:
-		io_mc_regs = (u32 *)&pitcairn_io_mc_regs;
+		io_mc_regs = (const u32 *)&pitcairn_io_mc_regs;
 		ucode_size = SI_MC_UCODE_SIZE;
 		regs_size = TAHITI_IO_MC_REGS_SIZE;
 		break;
 	case CHIP_VERDE:
 	default:
-		io_mc_regs = (u32 *)&verde_io_mc_regs;
+		io_mc_regs = (const u32 *)&verde_io_mc_regs;
 		ucode_size = SI_MC_UCODE_SIZE;
 		regs_size = TAHITI_IO_MC_REGS_SIZE;
 		break;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501312218.t0VMIr7m035695>