fw_cfg: fix sparse warnings in fw_cfg_sel_endianness()
authorMarc-André Lureau <marcandre.lureau@redhat.com>
Wed, 28 Feb 2018 15:06:05 +0000 (16:06 +0100)
committerMichael S. Tsirkin <mst@redhat.com>
Tue, 20 Mar 2018 01:17:37 +0000 (03:17 +0200)
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>
drivers/firmware/qemu_fw_cfg.c

index a41b572eeeb1071374edb0fc27372ba879208fda..e7ea2b3b1d11d051340942f70487a80b738e1dc0 100644 (file)
@@ -68,9 +68,12 @@ static void __iomem *fw_cfg_reg_data;
 static DEFINE_MUTEX(fw_cfg_dev_lock);
 
 /* pick appropriate endianness for selector key */
-static inline u16 fw_cfg_sel_endianness(u16 key)
+static void fw_cfg_sel_endianness(u16 key)
 {
-       return fw_cfg_is_mmio ? cpu_to_be16(key) : cpu_to_le16(key);
+       if (fw_cfg_is_mmio)
+               iowrite16be(key, fw_cfg_reg_ctrl);
+       else
+               iowrite16(key, fw_cfg_reg_ctrl);
 }
 
 /* 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,
        }
 
        mutex_lock(&fw_cfg_dev_lock);
-       iowrite16(fw_cfg_sel_endianness(key), fw_cfg_reg_ctrl);
+       fw_cfg_sel_endianness(key);
        while (pos-- > 0)
                ioread8(fw_cfg_reg_data);
        ioread8_rep(fw_cfg_reg_data, buf, count);