[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/20] pcihp: replace enable|disable_device() with on
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 02/20] pcihp: replace enable|disable_device() with oneliners |
Date: |
Mon, 10 Feb 2014 18:47:46 +0200 |
From: Igor Mammedov <address@hidden>
enable_device() and disable_device() functions aren't reused anywere,
so replace them with respective oneliners at call sites.
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/acpi/pcihp.c | 14 ++------------
1 file 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;
--
MST
- [Qemu-devel] [PULL 00/20] acpi,pc,pci fixes and enhancements, Michael S. Tsirkin, 2014/02/10
- [Qemu-devel] [PULL 01/20] pcihp: reduce number of device check events, Michael S. Tsirkin, 2014/02/10
- [Qemu-devel] [PULL 03/20] pcihp: make PCI hotplug mmio handlers indifferent to PCI_HOTPLUG_ADDR, Michael S. Tsirkin, 2014/02/10
- [Qemu-devel] [PULL 04/20] pcihp: make pci_read() mmio calback compatible with legacy ACPI hotplug, Michael S. Tsirkin, 2014/02/10
- [Qemu-devel] [PULL 02/20] pcihp: replace enable|disable_device() with oneliners,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 06/20] hw:piix4:acpi: reuse pcihp code for legacy PCI hotplug, Michael S. Tsirkin, 2014/02/10
- [Qemu-devel] [PULL 05/20] pcihp: remove unused AcpiPciHpPciStatus.device_present field, Michael S. Tsirkin, 2014/02/10
- [Qemu-devel] [PULL 07/20] qtest: don't report signals if qtest driver enabled, Michael S. Tsirkin, 2014/02/10
- [Qemu-devel] [PULL 08/20] pc_piix: enable legacy hotplug for Xen, Michael S. Tsirkin, 2014/02/10
- [Qemu-devel] [PULL 10/20] loader: document that errno is set, Michael S. Tsirkin, 2014/02/10
- [Qemu-devel] [PULL 09/20] pc.c: better error message on initrd sizing failure, Michael S. Tsirkin, 2014/02/10
- [Qemu-devel] [PULL 11/20] define hotplug interface, Michael S. Tsirkin, 2014/02/10
- [Qemu-devel] [PULL 12/20] qdev: add to BusState "hotplug-handler" link, Michael S. Tsirkin, 2014/02/10
- [Qemu-devel] [PULL 13/20] qdev: add "hotpluggable" property to Device, Michael S. Tsirkin, 2014/02/10