From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48046) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7p0p-00067G-4G for qemu-devel@nongnu.org; Mon, 27 Jan 2014 11:26:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W7p0i-0000Gu-NA for qemu-devel@nongnu.org; Mon, 27 Jan 2014 11:26:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57966) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7p0i-0000Gl-FC for qemu-devel@nongnu.org; Mon, 27 Jan 2014 11:26:08 -0500 From: Igor Mammedov Date: Mon, 27 Jan 2014 16:39:52 +0100 Message-Id: <1390837195-6508-2-git-send-email-imammedo@redhat.com> In-Reply-To: <1390837195-6508-1-git-send-email-imammedo@redhat.com> References: <1390837195-6508-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH v2 1/4] hw:piix4:acpi: replace enable|disable_device() with oneliners List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@amazon.com, mst@redhat.com enable_device() and disable_device() functions aren't reused anywere, so replace them with respective oneliners at call sites. Signed-off-by: Igor Mammedov --- hw/acpi/pcihp.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c index 4345f5d..464739a 100644 --- a/hw/acpi/pcihp.c +++ b/hw/acpi/pcihp.c @@ -177,16 +177,6 @@ void acpi_pcihp_reset(AcpiPciHpState *s) acpi_pcihp_update(s); } -static void enable_device(AcpiPciHpState *s, unsigned bsel, int slot) -{ - s->acpi_pcihp_pci_status[bsel].up |= (1U << slot); -} - -static void disable_device(AcpiPciHpState *s, unsigned bsel, int slot) -{ - s->acpi_pcihp_pci_status[bsel].down |= (1U << slot); -} - int acpi_pcihp_device_hotplug(AcpiPciHpState *s, PCIDevice *dev, PCIHotplugState state) { @@ -204,9 +194,9 @@ int acpi_pcihp_device_hotplug(AcpiPciHpState *s, PCIDevice *dev, } if (state == PCI_HOTPLUG_ENABLED) { - enable_device(s, bsel, slot); + s->acpi_pcihp_pci_status[bsel].up |= (1U << slot); } else { - disable_device(s, bsel, slot); + s->acpi_pcihp_pci_status[bsel].down |= (1U << slot); } return 0; -- 1.7.1