diff options
author | dim <dim@FreeBSD.org> | 2015-02-12 07:21:22 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2015-02-12 07:21:22 +0000 |
commit | 22fe1f654247dc9543cc8fc043ce6bc9e6e5b5d9 (patch) | |
tree | 6c5cc8c4e4dd28a10c8ee0ddf8d9d690789ceca8 /sys/dev/drm2 | |
parent | a9d7d10c208a910d1f4132d0ff76c4cc58676124 (diff) | |
download | FreeBSD-src-22fe1f654247dc9543cc8fc043ce6bc9e6e5b5d9.zip FreeBSD-src-22fe1f654247dc9543cc8fc043ce6bc9e6e5b5d9.tar.gz |
MFC r278004:
Constify a number of accesses in drm2's radeon drivers to avoid
-Wcast-qual warnings. No functional change.
Reviewed by: dumbbell
Differential Revision: https://reviews.freebsd.org/D1727
MFC r278438:
After r278004 was committed, Bruce Evans noted that the casts were
actually completely unnecessary, here:
https://lists.freebsd.org/pipermail/svn-src-all/2015-February/098478.html
Remove the casts, and just assign &xxx_io_mc_regs[0][0] directly.
Reviewed by: dumbbell
Differential Revision: https://reviews.freebsd.org/D1748
Diffstat (limited to 'sys/dev/drm2')
-rw-r--r-- | sys/dev/drm2/radeon/ni.c | 10 | ||||
-rw-r--r-- | sys/dev/drm2/radeon/si.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/drm2/radeon/ni.c b/sys/dev/drm2/radeon/ni.c index 7995684..1484b3e 100644 --- a/sys/dev/drm2/radeon/ni.c +++ b/sys/dev/drm2/radeon/ni.c @@ -182,7 +182,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) @@ -190,23 +190,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/dev/drm2/radeon/si.c b/sys/dev/drm2/radeon/si.c index 6a04b94..0fdefd2 100644 --- a/sys/dev/drm2/radeon/si.c +++ b/sys/dev/drm2/radeon/si.c @@ -182,7 +182,7 @@ static 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, ucode_size, regs_size; if (!rdev->mc_fw) @@ -190,18 +190,18 @@ static 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]; 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 = &pitcairn_io_mc_regs[0][0]; 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 = &verde_io_mc_regs[0][0]; ucode_size = SI_MC_UCODE_SIZE; regs_size = TAHITI_IO_MC_REGS_SIZE; break; |