| Message ID | 1377442777-11066-3-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
On Sun, Aug 25, 2013 at 03:59:30PM +0100, Peter Maydell wrote: > Replace the legacy cpu_to_le32wu() with stl_le_p(). > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > hw/net/ne2000.c | 2 +- > include/hw/pci/pci.h | 2 +- > include/qemu/bswap.h | 5 ----- > 3 files changed, 2 insertions(+), 7 deletions(-) Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c index 31afd28..e7865e9 100644 --- a/hw/net/ne2000.c +++ b/hw/net/ne2000.c @@ -467,7 +467,7 @@ static inline void ne2000_mem_writel(NE2000State *s, uint32_t addr, addr &= ~1; /* XXX: check exact behaviour if not even */ if (addr < 32 || (addr >= NE2000_PMEM_START && addr < NE2000_MEM_SIZE)) { - cpu_to_le32wu((uint32_t *)(s->mem + addr), val); + stl_le_p(s->mem + addr, val); } } diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index ae82064..2de27c5 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -434,7 +434,7 @@ pci_get_word(const uint8_t *config) static inline void pci_set_long(uint8_t *config, uint32_t val) { - cpu_to_le32wu((uint32_t *)config, val); + stl_le_p(config, val); } static inline uint32_t diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index ada1084..d0c4ff0 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 void cpu_to_le32wu(uint32_t *p, uint32_t v) -{ - stl_le_p(p, v); -} - static inline uint16_t le16_to_cpupu(const uint16_t *p) { return lduw_le_p(p);
Replace the legacy cpu_to_le32wu() with stl_le_p(). Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/net/ne2000.c | 2 +- include/hw/pci/pci.h | 2 +- include/qemu/bswap.h | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-)