From: Peter Maydell Date: Tue, 5 Nov 2013 16:38:31 +0000 (+0000) Subject: bswap.h: Remove le16_to_cpupu() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c65e5de94dbe667743d1523d6b4ac301cd76b0fe;p=qemu.git bswap.h: Remove le16_to_cpupu() Replace the legacy le16_to_cpupu() with lduw_le_p(). Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Michael S. Tsirkin Message-id: 1383669517-25598-4-git-send-email-peter.maydell@linaro.org Signed-off-by: Anthony Liguori --- diff --git a/hw/acpi/core.c b/hw/acpi/core.c index 246ade36e0..58308a3406 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -170,8 +170,7 @@ static void acpi_table_install(const char unsigned *blob, size_t bloblen, } /* increase number of tables */ - stw_le_p(acpi_tables, - le16_to_cpupu((uint16_t *)acpi_tables) + 1u); + stw_le_p(acpi_tables, lduw_le_p(acpi_tables) + 1u); /* Update the header fields. The strings need not be NUL-terminated. */ changed_fields = 0; diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 9cd0642b7f..9c961a9949 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -427,7 +427,7 @@ pci_set_word(uint8_t *config, uint16_t val) static inline uint16_t pci_get_word(const uint8_t *config) { - return le16_to_cpupu((const uint16_t *)config); + return lduw_le_p(config); } static inline void diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index d0c4ff0f29..1c500026a1 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -412,11 +412,6 @@ static inline void stfq_be_p(void *ptr, float64 v) /* Legacy unaligned versions. Note that we never had a complete set. */ -static inline uint16_t le16_to_cpupu(const uint16_t *p) -{ - return lduw_le_p(p); -} - static inline uint32_t le32_to_cpupu(const uint32_t *p) { return ldl_le_p(p);