From 6405c86412719a0ccd1a09b81baf0b78e8a4ae6b Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Sat, 8 Sep 2012 16:40:56 +0200 Subject: [PATCH] vga: rename isa_vga_init() to isa_std_vga_init() This better explains what is this function about. Adjust all callers. Cc: Anthony Liguori Signed-off-by: Aurelien Jarno --- hw/mips_r4k.c | 2 +- hw/pc.c | 2 +- hw/pc.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c index 967a76e..2115f7f 100644 --- a/hw/mips_r4k.c +++ b/hw/mips_r4k.c @@ -281,7 +281,7 @@ void mips_r4k_init (ram_addr_t ram_size, } } - isa_vga_init(isa_bus); + isa_std_vga_init(isa_bus); if (nd_table[0].used) isa_ne2000_init(isa_bus, 0x300, 9, &nd_table[0]); diff --git a/hw/pc.c b/hw/pc.c index 33fee62..78805f6 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1016,7 +1016,7 @@ DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus) if (pci_bus) { dev = pci_std_vga_init(pci_bus); } else { - dev = isa_vga_init(isa_bus); + dev = isa_std_vga_init(isa_bus); } } diff --git a/hw/pc.h b/hw/pc.h index e4db071..77c38d6 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -176,7 +176,7 @@ enum vga_retrace_method { extern enum vga_retrace_method vga_retrace_method; -static inline DeviceState *isa_vga_init(ISABus *bus) +static inline DeviceState *isa_std_vga_init(ISABus *bus) { ISADevice *dev; -- 2.7.4