[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 37/50] lasi: remove address space parameter from lasi_initfn()
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v2 37/50] lasi: remove address space parameter from lasi_initfn() |
Date: |
Wed, 4 May 2022 10:25:47 +0100 |
Now that all of the LASI devices are mapped by the board, this parameter is no
longer required.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
---
hw/hppa/hppa_sys.h | 2 +-
hw/hppa/lasi.c | 2 +-
hw/hppa/machine.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/hppa/hppa_sys.h b/hw/hppa/hppa_sys.h
index 3832b787d1..31e3856059 100644
--- a/hw/hppa/hppa_sys.h
+++ b/hw/hppa/hppa_sys.h
@@ -11,7 +11,7 @@
#include "hppa_hardware.h"
-LasiState *lasi_initfn(MemoryRegion *);
+LasiState *lasi_initfn(void);
#define enable_lasi_lan() 0
/* hppa_pci.c. */
diff --git a/hw/hppa/lasi.c b/hw/hppa/lasi.c
index 9d8c9e3936..81c8e4d2d9 100644
--- a/hw/hppa/lasi.c
+++ b/hw/hppa/lasi.c
@@ -227,7 +227,7 @@ static void lasi_set_irq(void *opaque, int irq, int level)
}
}
-LasiState *lasi_initfn(MemoryRegion *address_space)
+LasiState *lasi_initfn(void)
{
DeviceState *dev;
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index 1d48ec341d..52f12f6604 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -178,7 +178,7 @@ static void machine_hppa_init(MachineState *machine)
/* Init Lasi chip */
- lasi_dev = DEVICE(lasi_initfn(addr_space));
+ lasi_dev = DEVICE(lasi_initfn());
memory_region_add_subregion(addr_space, LASI_HPA,
sysbus_mmio_get_region(
SYS_BUS_DEVICE(lasi_dev), 0));
--
2.20.1
- Re: [PATCH v2 32/50] lasi: update lasi_initfn() to return LASIState, (continued)
- [PATCH v2 33/50] lasi: move LAN initialisation to machine.c, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 35/50] lasi: move second serial port initialisation to machine.c, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 36/50] lasi: move PS2 initialisation to machine.c, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 34/50] lasi: move parallel port initialisation to machine.c, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 37/50] lasi: remove address space parameter from lasi_initfn(),
Mark Cave-Ayland <=
- [PATCH v2 38/50] lasi: move lasi_initfn() to machine.c, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 39/50] lasi: use constants for device register offsets, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 40/50] lasi: use numerical constant for iar reset value, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 41/50] hppa: move device headers from hppa_sys.h into individual .c files, Mark Cave-Ayland, 2022/05/04