From: Philippe Mathieu-Daudé <[email protected]> DEFINE_PROP_DMAADDR() is only used once. Since it doesn't add much value, simply remove it, along with the header defining it.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Markus Armbruster <[email protected]> Message-Id: <[email protected]> Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- include/hw/core/qdev-dma.h | 16 ---------------- hw/usb/hcd-ohci-pci.c | 1 - hw/usb/hcd-ohci-sysbus.c | 3 +-- hw/usb/hcd-ohci.c | 1 - 4 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 include/hw/core/qdev-dma.h diff --git a/include/hw/core/qdev-dma.h b/include/hw/core/qdev-dma.h deleted file mode 100644 index b00391aa0c3..00000000000 --- a/include/hw/core/qdev-dma.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Support for dma_addr_t typed properties - * - * Copyright (C) 2012 David Gibson, IBM Corporation. - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - */ - -#ifndef HW_QDEV_DMA_H -#define HW_QDEV_DMA_H - -#define DEFINE_PROP_DMAADDR(_n, _s, _f, _d) \ - DEFINE_PROP_UINT64(_n, _s, _f, _d) - -#endif diff --git a/hw/usb/hcd-ohci-pci.c b/hw/usb/hcd-ohci-pci.c index 18b58f5fcbc..70c9e9ac4f5 100644 --- a/hw/usb/hcd-ohci-pci.c +++ b/hw/usb/hcd-ohci-pci.c @@ -25,7 +25,6 @@ #include "migration/vmstate.h" #include "hw/pci/pci_device.h" #include "hw/core/sysbus.h" -#include "hw/core/qdev-dma.h" #include "hw/core/qdev-properties.h" #include "trace.h" #include "hcd-ohci.h" diff --git a/hw/usb/hcd-ohci-sysbus.c b/hw/usb/hcd-ohci-sysbus.c index 1a2cf29bed8..4f51eebccb2 100644 --- a/hw/usb/hcd-ohci-sysbus.c +++ b/hw/usb/hcd-ohci-sysbus.c @@ -26,7 +26,6 @@ #include "hw/usb/usb.h" #include "migration/vmstate.h" #include "hw/core/sysbus.h" -#include "hw/core/qdev-dma.h" #include "hw/core/qdev-properties.h" #include "trace.h" #include "hcd-ohci.h" @@ -61,7 +60,7 @@ static const Property ohci_sysbus_properties[] = { DEFINE_PROP_STRING("masterbus", OHCISysBusState, masterbus), DEFINE_PROP_UINT32("num-ports", OHCISysBusState, num_ports, 3), DEFINE_PROP_UINT32("firstport", OHCISysBusState, firstport, 0), - DEFINE_PROP_DMAADDR("dma-offset", OHCISysBusState, dma_offset, 0), + DEFINE_PROP_UINT64("dma-offset", OHCISysBusState, dma_offset, 0), }; static void ohci_sysbus_class_init(ObjectClass *klass, const void *data) diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index c4a9741bd42..23990115abe 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -34,7 +34,6 @@ #include "hw/usb/usb.h" #include "migration/vmstate.h" #include "hw/core/sysbus.h" -#include "hw/core/qdev-dma.h" #include "hw/core/qdev-properties.h" #include "trace.h" #include "hcd-ohci.h" -- 2.53.0
