[10/12] vt82c686: Remove unneeded includes and defines

Commit Message

BALATON Zoltan Dec. 27, 2020, 1:10 a.m. UTC

These are not used or not needed.

Signed-off-by: BALATON Zoltan <[e-mail]>
---
 hw/isa/vt82c686.c | 8 --------
 1 file changed, 8 deletions(-)

Comments

Philippe Mathieu-Daudé Dec. 27, 2020, 2:51 p.m. UTC | #1

On 12/27/20 2:10 AM, BALATON Zoltan via wrote:
> These are not used or not needed.
> 
> Signed-off-by: BALATON Zoltan <[e-mail]>
> ---
>  hw/isa/vt82c686.c | 8 --------
>  1 file changed, 8 deletions(-)
> 
> diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
> index 789459bcae..6dff2bc67d 100644
> --- a/hw/isa/vt82c686.c
> +++ b/hw/isa/vt82c686.c
> @@ -12,22 +12,16 @@
>  
>  #include "qemu/osdep.h"
>  #include "hw/isa/vt82c686.h"
> -#include "hw/i2c/i2c.h"

Maybe squash this one in patch 8 "Remove vt82c686b_pm_init"?

>  #include "hw/pci/pci.h"
>  #include "hw/qdev-properties.h"
> -#include "hw/isa/isa.h"

Used for isa_bus_new().

>  #include "hw/isa/superio.h"
> -#include "hw/sysbus.h"

OK.

>  #include "migration/vmstate.h"
> -#include "hw/mips/mips.h"

Indeed I can't see anything in commit edf79e66c02 ("Initial support
of vt82686b south bridge used by fulong mini pc") requiring it.

>  #include "hw/isa/apm.h"
>  #include "hw/acpi/acpi.h"
>  #include "hw/i2c/pm_smbus.h"
>  #include "qapi/error.h"
> -#include "qemu/module.h"

type_init().

>  #include "qemu/timer.h"
>  #include "exec/address-spaces.h"
> -#include "qom/object.h"

OK.

>  #include "trace.h"
>  
>  typedef struct SuperIOConfig {
> @@ -137,8 +131,6 @@ static void vt82c686b_write_config(PCIDevice *d, uint32_t addr,
>      }
>  }
>  
> -#define ACPI_DBG_IO_ADDR  0xb044
> -
>  struct VT686PMState {
>      PCIDevice dev;
>      MemoryRegion io;
>

Patch

diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index 789459bcae..6dff2bc67d 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -12,22 +12,16 @@ 
 
 #include "qemu/osdep.h"
 #include "hw/isa/vt82c686.h"
-#include "hw/i2c/i2c.h"
 #include "hw/pci/pci.h"
 #include "hw/qdev-properties.h"
-#include "hw/isa/isa.h"
 #include "hw/isa/superio.h"
-#include "hw/sysbus.h"
 #include "migration/vmstate.h"
-#include "hw/mips/mips.h"
 #include "hw/isa/apm.h"
 #include "hw/acpi/acpi.h"
 #include "hw/i2c/pm_smbus.h"
 #include "qapi/error.h"
-#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "exec/address-spaces.h"
-#include "qom/object.h"
 #include "trace.h"
 
 typedef struct SuperIOConfig {
@@ -137,8 +131,6 @@  static void vt82c686b_write_config(PCIDevice *d, uint32_t addr,
     }
 }
 
-#define ACPI_DBG_IO_ADDR  0xb044
-
 struct VT686PMState {
     PCIDevice dev;
     MemoryRegion io;