Module Name: src
Committed By: joerg
Date: Sat Nov 22 18:50:49 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: cik.c ni.c si.c
Log Message:
Drop casts in favour of expressions that actually give the right
pointer.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/radeon/cik.c \
src/sys/external/bsd/drm2/dist/drm/radeon/ni.c \
src/sys/external/bsd/drm2/dist/drm/radeon/si.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/radeon/cik.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/cik.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/cik.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/cik.c:1.2 Wed Jul 16 20:59:57 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/cik.c Sat Nov 22 18:50:49 2014
@@ -1771,7 +1771,7 @@ int ci_mc_load_microcode(struct radeon_d
{
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_d
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:
Index: src/sys/external/bsd/drm2/dist/drm/radeon/ni.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/ni.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/ni.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/ni.c:1.2 Wed Jul 16 20:59:57 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/ni.c Sat Nov 22 18:50:49 2014
@@ -609,7 +609,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)
@@ -617,23 +617,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 = &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;
Index: src/sys/external/bsd/drm2/dist/drm/radeon/si.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/si.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/si.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/si.c:1.2 Wed Jul 16 20:59:57 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/si.c Sat Nov 22 18:50:49 2014
@@ -1471,7 +1471,7 @@ int si_mc_load_microcode(struct radeon_d
{
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_d
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;
}
