From e824b2cc3b4f6fbcbaa254abd8db55d2fbe8d19e Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Mon, 8 Aug 2011 16:09:31 +0300 Subject: pci: rename pci_register_bar_region() to pci_register_bar() Reviewed-by: Richard Henderson Reviewed-by: Anthony Liguori Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori --- hw/ide/cmd646.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'hw/ide/cmd646.c') diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 13e6f2ff91..4d91e2c642 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -270,16 +270,12 @@ static int pci_cmd646_ide_initfn(PCIDevice *dev) setup_cmd646_bar(d, 0); setup_cmd646_bar(d, 1); - pci_register_bar_region(dev, 0, PCI_BASE_ADDRESS_SPACE_IO, - &d->cmd646_bar[0].data); - pci_register_bar_region(dev, 1, PCI_BASE_ADDRESS_SPACE_IO, - &d->cmd646_bar[0].cmd); - pci_register_bar_region(dev, 2, PCI_BASE_ADDRESS_SPACE_IO, - &d->cmd646_bar[1].data); - pci_register_bar_region(dev, 3, PCI_BASE_ADDRESS_SPACE_IO, - &d->cmd646_bar[1].cmd); + pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &d->cmd646_bar[0].data); + pci_register_bar(dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &d->cmd646_bar[0].cmd); + pci_register_bar(dev, 2, PCI_BASE_ADDRESS_SPACE_IO, &d->cmd646_bar[1].data); + pci_register_bar(dev, 3, PCI_BASE_ADDRESS_SPACE_IO, &d->cmd646_bar[1].cmd); bmdma_setup_bar(d); - pci_register_bar_region(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar); + pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar); /* TODO: RST# value should be 0 */ pci_conf[PCI_INTERRUPT_PIN] = 0x01; // interrupt on pin 1 -- cgit v1.2.1