| Message ID | 20200704144943.18292-8-f4bug@amsat.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/usb: Give it love, reduce 'hw/usb.h' inclusion out of hw/usb/ | expand |
On Sat, Jul 4, 2020 at 7:52 AM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > > The header "usb/hcd-dwc2.h" doesn't need to include "qemu/timer.h", > "sysemu/dma.h", "hw/irq.h" (the types required are forward declared). > Include them in the source file which is the only one requiring the > function declarations. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/usb/hcd-dwc2.h | 3 --- > hw/usb/hcd-dwc2.c | 3 +++ > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/usb/hcd-dwc2.h b/hw/usb/hcd-dwc2.h > index 4ba809a07b..2adf0f53c7 100644 > --- a/hw/usb/hcd-dwc2.h > +++ b/hw/usb/hcd-dwc2.h > @@ -19,11 +19,8 @@ > #ifndef HW_USB_DWC2_H > #define HW_USB_DWC2_H > > -#include "qemu/timer.h" > -#include "hw/irq.h" > #include "hw/sysbus.h" > #include "hw/usb.h" > -#include "sysemu/dma.h" > > #define DWC2_MMIO_SIZE 0x11000 > > diff --git a/hw/usb/hcd-dwc2.c b/hw/usb/hcd-dwc2.c > index 590e75b455..ccf05d0823 100644 > --- a/hw/usb/hcd-dwc2.c > +++ b/hw/usb/hcd-dwc2.c > @@ -36,8 +36,11 @@ > #include "qapi/error.h" > #include "hw/usb/dwc2-regs.h" > #include "hw/usb/hcd-dwc2.h" > +#include "hw/irq.h" > +#include "sysemu/dma.h" > #include "migration/vmstate.h" > #include "trace.h" > +#include "qemu/timer.h" > #include "qemu/log.h" > #include "hw/qdev-properties.h" > > -- > 2.21.3 > >
On Sat, Jul 4, 2020 at 7:50 AM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > The header "usb/hcd-dwc2.h" doesn't need to include "qemu/timer.h", > "sysemu/dma.h", "hw/irq.h" (the types required are forward declared). > Include them in the source file which is the only one requiring the > function declarations. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/usb/hcd-dwc2.h | 3 --- > hw/usb/hcd-dwc2.c | 3 +++ > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/usb/hcd-dwc2.h b/hw/usb/hcd-dwc2.h > index 4ba809a07b..2adf0f53c7 100644 > --- a/hw/usb/hcd-dwc2.h > +++ b/hw/usb/hcd-dwc2.h > @@ -19,11 +19,8 @@ > #ifndef HW_USB_DWC2_H > #define HW_USB_DWC2_H > > -#include "qemu/timer.h" > -#include "hw/irq.h" > #include "hw/sysbus.h" > #include "hw/usb.h" > -#include "sysemu/dma.h" > > #define DWC2_MMIO_SIZE 0x11000 > > diff --git a/hw/usb/hcd-dwc2.c b/hw/usb/hcd-dwc2.c > index 590e75b455..ccf05d0823 100644 > --- a/hw/usb/hcd-dwc2.c > +++ b/hw/usb/hcd-dwc2.c > @@ -36,8 +36,11 @@ > #include "qapi/error.h" > #include "hw/usb/dwc2-regs.h" > #include "hw/usb/hcd-dwc2.h" > +#include "hw/irq.h" > +#include "sysemu/dma.h" > #include "migration/vmstate.h" > #include "trace.h" > +#include "qemu/timer.h" > #include "qemu/log.h" > #include "hw/qdev-properties.h" > > -- > 2.21.3 > > Reviewed-by: Paul Zimmerman <pauldzim@gmail.com>
diff --git a/hw/usb/hcd-dwc2.h b/hw/usb/hcd-dwc2.h index 4ba809a07b..2adf0f53c7 100644 --- a/hw/usb/hcd-dwc2.h +++ b/hw/usb/hcd-dwc2.h @@ -19,11 +19,8 @@ #ifndef HW_USB_DWC2_H #define HW_USB_DWC2_H -#include "qemu/timer.h" -#include "hw/irq.h" #include "hw/sysbus.h" #include "hw/usb.h" -#include "sysemu/dma.h" #define DWC2_MMIO_SIZE 0x11000 diff --git a/hw/usb/hcd-dwc2.c b/hw/usb/hcd-dwc2.c index 590e75b455..ccf05d0823 100644 --- a/hw/usb/hcd-dwc2.c +++ b/hw/usb/hcd-dwc2.c @@ -36,8 +36,11 @@ #include "qapi/error.h" #include "hw/usb/dwc2-regs.h" #include "hw/usb/hcd-dwc2.h" +#include "hw/irq.h" +#include "sysemu/dma.h" #include "migration/vmstate.h" #include "trace.h" +#include "qemu/timer.h" #include "qemu/log.h" #include "hw/qdev-properties.h"
The header "usb/hcd-dwc2.h" doesn't need to include "qemu/timer.h", "sysemu/dma.h", "hw/irq.h" (the types required are forward declared). Include them in the source file which is the only one requiring the function declarations. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/usb/hcd-dwc2.h | 3 --- hw/usb/hcd-dwc2.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)