diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2018-02-28 10:06:05 -0500 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2018-03-19 21:17:37 -0400 |
commit | 8d59d5bd8f088be1366f69590729aaef2f8cb17b (patch) | |
tree | 47ff380353af03da24c13f63b3a5c4dfa6963ca6 /drivers/firmware/qemu_fw_cfg.c | |
parent | c8f06a066816b17f3d1c07da9a5c4f387871c590 (diff) |
fw_cfg: fix sparse warnings in fw_cfg_sel_endianness()
Dispatch to the appropriate iowrite() instead of casting restricted
type to u16.
- if fw_cfg_is_mmio:
before: iowrite16(cpu_to_be16(key))
after: iowrite16be(key)
- if !fw_cfg_is_mmio:
before: iowrite16(cpu_to_le16(key))
after: iowrite16(key)
which is equivalent on little-endian systems, where fw_cfg IO is supported.
Fixes:
$ make C=1 CF=-D__CHECK_ENDIAN__ drivers/firmware/qemu_fw_cfg.o
drivers/firmware/qemu_fw_cfg.c:55:33: warning: restricted __be16 degrades to integer
drivers/firmware/qemu_fw_cfg.c:55:52: warning: restricted __le16 degrades to integer
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/firmware/qemu_fw_cfg.c')
-rw-r--r-- | drivers/firmware/qemu_fw_cfg.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c index a41b572eeeb1..e7ea2b3b1d11 100644 --- a/drivers/firmware/qemu_fw_cfg.c +++ b/drivers/firmware/qemu_fw_cfg.c | |||
@@ -68,9 +68,12 @@ static void __iomem *fw_cfg_reg_data; | |||
68 | static DEFINE_MUTEX(fw_cfg_dev_lock); | 68 | static DEFINE_MUTEX(fw_cfg_dev_lock); |
69 | 69 | ||
70 | /* pick appropriate endianness for selector key */ | 70 | /* pick appropriate endianness for selector key */ |
71 | static inline u16 fw_cfg_sel_endianness(u16 key) | 71 | static void fw_cfg_sel_endianness(u16 key) |
72 | { | 72 | { |
73 | return fw_cfg_is_mmio ? cpu_to_be16(key) : cpu_to_le16(key); | 73 | if (fw_cfg_is_mmio) |
74 | iowrite16be(key, fw_cfg_reg_ctrl); | ||
75 | else | ||
76 | iowrite16(key, fw_cfg_reg_ctrl); | ||
74 | } | 77 | } |
75 | 78 | ||
76 | /* read chunk of given fw_cfg blob (caller responsible for sanity-check) */ | 79 | /* read chunk of given fw_cfg blob (caller responsible for sanity-check) */ |
@@ -92,7 +95,7 @@ static inline void fw_cfg_read_blob(u16 key, | |||
92 | } | 95 | } |
93 | 96 | ||
94 | mutex_lock(&fw_cfg_dev_lock); | 97 | mutex_lock(&fw_cfg_dev_lock); |
95 | iowrite16(fw_cfg_sel_endianness(key), fw_cfg_reg_ctrl); | 98 | fw_cfg_sel_endianness(key); |
96 | while (pos-- > 0) | 99 | while (pos-- > 0) |
97 | ioread8(fw_cfg_reg_data); | 100 | ioread8(fw_cfg_reg_data); |
98 | ioread8_rep(fw_cfg_reg_data, buf, count); | 101 | ioread8_rep(fw_cfg_reg_data, buf, count); |