diff options
author | Jiri Slaby <jslaby@suse.cz> | 2016-10-03 11:58:28 +0300 |
---|---|---|
committer | Sasha Levin <alexander.levin@verizon.com> | 2016-11-24 05:28:25 +0300 |
commit | 4a2ede59ea828df9616e3c7619252875912ea872 (patch) | |
tree | d30b3098524b6f3a7c0b54c6b442500ee52d7f58 /drivers/mmc | |
parent | 69335972b1c1c9bd7597fc6080b6eb1bd3fbf774 (diff) | |
download | linux-4a2ede59ea828df9616e3c7619252875912ea872.tar.xz |
mmc: core: Annotate cmd_hdr as __le32
[ Upstream commit 3f2d26643595973e835e8356ea90c7c15cb1b0f1 ]
Commit f68381a70bb2 (mmc: block: fix packed command header endianness)
correctly fixed endianness handling of packed_cmd_hdr in
mmc_blk_packed_hdr_wrq_prep.
But now, sparse complains about incorrect types:
drivers/mmc/card/block.c:1613:27: sparse: incorrect type in assignment (different base types)
drivers/mmc/card/block.c:1613:27: expected unsigned int [unsigned] [usertype] <noident>
drivers/mmc/card/block.c:1613:27: got restricted __le32 [usertype] <noident>
...
So annotate cmd_hdr properly using __le32 to make everyone happy.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Fixes: f68381a70bb2 (mmc: block: fix packed command header endianness)
Cc: stable@vger.kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/card/block.c | 2 | ||||
-rw-r--r-- | drivers/mmc/card/queue.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 4078ebe81c45..dec6b0ec4def 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1657,7 +1657,7 @@ static void mmc_blk_packed_hdr_wrq_prep(struct mmc_queue_req *mqrq, struct mmc_blk_data *md = mq->data; struct mmc_packed *packed = mqrq->packed; bool do_rel_wr, do_data_tag; - u32 *packed_cmd_hdr; + __le32 *packed_cmd_hdr; u8 hdr_blocks; u8 i = 1; diff --git a/drivers/mmc/card/queue.h b/drivers/mmc/card/queue.h index 99e6521e6169..f42c11293dd8 100644 --- a/drivers/mmc/card/queue.h +++ b/drivers/mmc/card/queue.h @@ -24,7 +24,7 @@ enum mmc_packed_type { struct mmc_packed { struct list_head list; - u32 cmd_hdr[1024]; + __le32 cmd_hdr[1024]; unsigned int blocks; u8 nr_entries; u8 retries; |