summaryrefslogtreecommitdiff
path: root/sys/external
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2014-11-22 18:50:49 +0000
committerjoerg <joerg@NetBSD.org>2014-11-22 18:50:49 +0000
commit716144f361f7bcf6e8a50bc754fa083f78c2f3af (patch)
tree1b741f08af8b1e2729422a331d18d3d1c8a1d952 /sys/external
parent6b025c494813123b348142d124d3af1ad9edb6a7 (diff)
Drop casts in favour of expressions that actually give the right
pointer.
Diffstat (limited to 'sys/external')
-rw-r--r--sys/external/bsd/drm2/dist/drm/radeon/cik.c6
-rw-r--r--sys/external/bsd/drm2/dist/drm/radeon/ni.c10
-rw-r--r--sys/external/bsd/drm2/dist/drm/radeon/si.c12
3 files changed, 14 insertions, 14 deletions
diff --git a/sys/external/bsd/drm2/dist/drm/radeon/cik.c b/sys/external/bsd/drm2/dist/drm/radeon/cik.c
index 68cac6ff723..5879dfe45ed 100644
--- a/sys/external/bsd/drm2/dist/drm/radeon/cik.c
+++ b/sys/external/bsd/drm2/dist/drm/radeon/cik.c
@@ -1771,7 +1771,7 @@ int ci_mc_load_microcode(struct radeon_device *rdev)
{
const __be32 *fw_data;
u32 running, blackout = 0;
- u32 *io_mc_regs;
+ const u32 *io_mc_regs;
int i, regs_size, ucode_size;
if (!rdev->mc_fw)
@@ -1781,11 +1781,11 @@ int ci_mc_load_microcode(struct radeon_device *rdev)
switch (rdev->family) {
case CHIP_BONAIRE:
- io_mc_regs = (u32 *)&bonaire_io_mc_regs;
+ io_mc_regs = &bonaire_io_mc_regs[0][0];
regs_size = BONAIRE_IO_MC_REGS_SIZE;
break;
case CHIP_HAWAII:
- io_mc_regs = (u32 *)&hawaii_io_mc_regs;
+ io_mc_regs = &hawaii_io_mc_regs[0][0];
regs_size = HAWAII_IO_MC_REGS_SIZE;
break;
default:
diff --git a/sys/external/bsd/drm2/dist/drm/radeon/ni.c b/sys/external/bsd/drm2/dist/drm/radeon/ni.c
index 9f2785a8897..56d94b924c0 100644
--- a/sys/external/bsd/drm2/dist/drm/radeon/ni.c
+++ b/sys/external/bsd/drm2/dist/drm/radeon/ni.c
@@ -609,7 +609,7 @@ int ni_mc_load_microcode(struct radeon_device *rdev)
{
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)
@@ -617,23 +617,23 @@ int ni_mc_load_microcode(struct radeon_device *rdev)
switch (rdev->family) {
case CHIP_BARTS:
- io_mc_regs = (u32 *)&barts_io_mc_regs;
+ io_mc_regs = &barts_io_mc_regs[0][0];
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 = &turks_io_mc_regs[0][0];
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 = &caicos_io_mc_regs[0][0];
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 = &cayman_io_mc_regs[0][0];
ucode_size = CAYMAN_MC_UCODE_SIZE;
regs_size = BTC_IO_MC_REGS_SIZE;
break;
diff --git a/sys/external/bsd/drm2/dist/drm/radeon/si.c b/sys/external/bsd/drm2/dist/drm/radeon/si.c
index 75e2abf67ff..13b96d8e7d1 100644
--- a/sys/external/bsd/drm2/dist/drm/radeon/si.c
+++ b/sys/external/bsd/drm2/dist/drm/radeon/si.c
@@ -1471,7 +1471,7 @@ int si_mc_load_microcode(struct radeon_device *rdev)
{
const __be32 *fw_data;
u32 running, blackout = 0;
- u32 *io_mc_regs;
+ const u32 *io_mc_regs;
int i, regs_size, ucode_size;
if (!rdev->mc_fw)
@@ -1481,24 +1481,24 @@ int si_mc_load_microcode(struct radeon_device *rdev)
switch (rdev->family) {
case CHIP_TAHITI:
- io_mc_regs = (u32 *)&tahiti_io_mc_regs;
+ io_mc_regs = &tahiti_io_mc_regs[0][0];
regs_size = TAHITI_IO_MC_REGS_SIZE;
break;
case CHIP_PITCAIRN:
- io_mc_regs = (u32 *)&pitcairn_io_mc_regs;
+ io_mc_regs = &pitcairn_io_mc_regs[0][0];
regs_size = TAHITI_IO_MC_REGS_SIZE;
break;
case CHIP_VERDE:
default:
- io_mc_regs = (u32 *)&verde_io_mc_regs;
+ io_mc_regs = &verde_io_mc_regs[0][0];
regs_size = TAHITI_IO_MC_REGS_SIZE;
break;
case CHIP_OLAND:
- io_mc_regs = (u32 *)&oland_io_mc_regs;
+ io_mc_regs = &oland_io_mc_regs[0][0];
regs_size = TAHITI_IO_MC_REGS_SIZE;
break;
case CHIP_HAINAN:
- io_mc_regs = (u32 *)&hainan_io_mc_regs;
+ io_mc_regs = &hainan_io_mc_regs[0][0];
regs_size = TAHITI_IO_MC_REGS_SIZE;
break;
}