]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
staging: brcm80211: sparse endianness warnings for struct sdpcm_shared
authorRoland Vossen <rvossen@broadcom.com>
Fri, 23 Sep 2011 00:07:41 +0000 (17:07 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 26 Sep 2011 23:55:30 +0000 (16:55 -0700)
Structure that is received from dongle has been annotated.

Reported-by: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c

index 57001d4e73a7bef3283b34435db112ac48d8d5f6..9d4850d32d60ddf2a39865a448df169a3563647e 100644 (file)
@@ -530,6 +530,17 @@ struct sdpcm_shared {
        u8 tag[32];
 };
 
+struct sdpcm_shared_le {
+       __le32 flags;
+       __le32 trap_addr;
+       __le32 assert_exp_addr;
+       __le32 assert_file_addr;
+       __le32 assert_line;
+       __le32 console_addr;    /* Address of struct rte_console */
+       __le32 msgtrace_addr;
+       u8 tag[32];
+};
+
 
 /* misc chip info needed by some of the routines */
 struct chip_info {
@@ -2919,6 +2930,7 @@ brcmf_sdbrcm_readshared(struct brcmf_bus *bus, struct sdpcm_shared *sh)
        u32 addr;
        __le32 addr_le;
        int rv;
+       struct sdpcm_shared_le sh_le;
 
        /* Read last word in memory to determine address of
                         sdpcm_shared structure */
@@ -2942,19 +2954,20 @@ brcmf_sdbrcm_readshared(struct brcmf_bus *bus, struct sdpcm_shared *sh)
        }
 
        /* Read rte_shared structure */
-       rv = brcmf_sdbrcm_membytes(bus, false, addr, (u8 *) sh,
-                             sizeof(struct sdpcm_shared));
+       rv = brcmf_sdbrcm_membytes(bus, false, addr, (u8 *) &sh_le,
+                             sizeof(struct sdpcm_shared_le));
        if (rv < 0)
                return rv;
 
        /* Endianness */
-       sh->flags = le32_to_cpu(sh->flags);
-       sh->trap_addr = le32_to_cpu(sh->trap_addr);
-       sh->assert_exp_addr = le32_to_cpu(sh->assert_exp_addr);
-       sh->assert_file_addr = le32_to_cpu(sh->assert_file_addr);
-       sh->assert_line = le32_to_cpu(sh->assert_line);
-       sh->console_addr = le32_to_cpu(sh->console_addr);
-       sh->msgtrace_addr = le32_to_cpu(sh->msgtrace_addr);
+       sh->flags = le32_to_cpu(sh_le.flags);
+       sh->trap_addr = le32_to_cpu(sh_le.trap_addr);
+       sh->assert_exp_addr = le32_to_cpu(sh_le.assert_exp_addr);
+       sh->assert_file_addr = le32_to_cpu(sh_le.assert_file_addr);
+       sh->assert_line = le32_to_cpu(sh_le.assert_line);
+       sh->console_addr = le32_to_cpu(sh_le.console_addr);
+       sh->msgtrace_addr = le32_to_cpu(sh_le.msgtrace_addr);
+       memcpy(sh->tag, sh_le.tag, sizeof(sh->tag));
 
        if ((sh->flags & SDPCM_SHARED_VERSION_MASK) != SDPCM_SHARED_VERSION) {
                brcmf_dbg(ERROR, "sdpcm_shared version %d in brcmf is different than sdpcm_shared version %d in dongle\n",