[ethtool] 13/20: marvell.c: fix strict alias warnings
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Mon Mar 14 11:37:16 UTC 2016
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch master
in repository ethtool.
commit 7208d977011262762f3d0da266ec843f22214acd
Author: Maciej Żenczykowski <maze at google.com>
Date: Fri Mar 11 09:58:18 2016 -0800
marvell.c: fix strict alias warnings
Addresses the following warnings:
marvell.c:426:2: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
marvell.c:427:2: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
marvell.c:428:2: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
Note: code appears endian-dependent, not fixed by this commit.
Signed-off-by: Maciej Żenczykowski <maze at google.com>
Signed-off-by: David Decotigny <decot at googlers.com>
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
---
marvell.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/marvell.c b/marvell.c
index e583c82..af21188 100644
--- a/marvell.c
+++ b/marvell.c
@@ -381,7 +381,8 @@ static void dump_prefetch(const char *name, const void *r)
int sky2_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
{
- const u32 *r = (const u32 *) regs->data;
+ const u16 *r16 = (const u16 *) regs->data;
+ const u32 *r32 = (const u32 *) regs->data;
int dual;
dump_pci(regs->data + 0x1c00);
@@ -390,15 +391,15 @@ int sky2_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
printf("\nBus Management Unit\n");
printf("-------------------\n");
- printf("CSR Receive Queue 1 0x%08X\n", r[24]);
- printf("CSR Sync Queue 1 0x%08X\n", r[26]);
- printf("CSR Async Queue 1 0x%08X\n", r[27]);
+ printf("CSR Receive Queue 1 0x%08X\n", r32[24]);
+ printf("CSR Sync Queue 1 0x%08X\n", r32[26]);
+ printf("CSR Async Queue 1 0x%08X\n", r32[27]);
dual = (regs->data[0x11e] & 2) != 0;
if (dual) {
- printf("CSR Receive Queue 2 0x%08X\n", r[25]);
- printf("CSR Async Queue 2 0x%08X\n", r[29]);
- printf("CSR Sync Queue 2 0x%08X\n", r[28]);
+ printf("CSR Receive Queue 2 0x%08X\n", r32[25]);
+ printf("CSR Async Queue 2 0x%08X\n", r32[29]);
+ printf("CSR Sync Queue 2 0x%08X\n", r32[28]);
}
dump_mac(regs->data);
@@ -423,9 +424,9 @@ int sky2_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs)
dump_timer("TX status", regs->data + 0xec0);
dump_timer("ISR", regs->data + 0xed0);
- printf("\nGMAC control 0x%04X\n", *(u32 *)(regs->data + 0xf00));
- printf("GPHY control 0x%04X\n", *(u32 *)(regs->data + 0xf04));
- printf("LINK control 0x%02hX\n", *(u16 *)(regs->data + 0xf10));
+ printf("\nGMAC control 0x%04X\n", r32[0xf00 >> 2]);
+ printf("GPHY control 0x%04X\n", r32[0xf04 >> 2]);
+ printf("LINK control 0x%02hX\n", r16[0xf10 >> 1]);
dump_gmac("GMAC 1", regs->data + 0x2800);
dump_gmac_fifo("Rx GMAC 1", regs->data + 0xc40);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/ethtool.git
More information about the Kernel-svn-changes
mailing list