Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f2d2664 authored by Jiri Slaby's avatar Jiri Slaby Committed by Ulf Hansson
Browse files

mmc: core: Annotate cmd_hdr as __le32 



Commit f68381a7 (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: default avatarJiri Slaby <jslaby@suse.cz>
Fixes: f68381a7 (mmc: block: fix packed command header endianness)
Cc: stable@vger.kernel.org
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 8a3bee9b

drivers/mmc/card/block.c

+1 −1
Original line number Diff line number Diff line
@@ -1787,7 +1787,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;

drivers/mmc/card/queue.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,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;