From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46330) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZmOLg-0002ky-Ml for qemu-devel@nongnu.org; Wed, 14 Oct 2015 11:52:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZmOLc-0002il-FN for qemu-devel@nongnu.org; Wed, 14 Oct 2015 11:52:16 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:31888) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZmOLc-0002hl-9B for qemu-devel@nongnu.org; Wed, 14 Oct 2015 11:52:12 -0400 From: Knut Omang Date: Wed, 14 Oct 2015 17:51:18 +0200 Message-Id: <1444837878-11602-5-git-send-email-knut.omang@oracle.com> In-Reply-To: <1444837878-11602-1-git-send-email-knut.omang@oracle.com> References: <1444837878-11602-1-git-send-email-knut.omang@oracle.com> Subject: [Qemu-devel] [PATCH v5 4/4] pcie: A few minor fixes (type+code simplify) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , "Michael S. Tsirkin" , Knut Omang , "Richard W.M. Jones" , Alex Williamson , "Gonglei (Arei)" , Jan Kiszka , Paolo Bonzini , Dotan Barak , Richard Henderson - Fix comment typo in pcie_cap_slot_write_config - Simplify code in pcie_cap_slot_hot_unplug_request_cb. Signed-off-by: Knut Omang --- hw/pci/pcie.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c index 774b9ed..ba49c0f 100644 --- a/hw/pci/pcie.c +++ b/hw/pci/pcie.c @@ -265,10 +265,11 @@ void pcie_cap_slot_hot_unplug_request_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { uint8_t *exp_cap; + PCIDevice *pdev = PCI_DEVICE(hotplug_dev); - pcie_cap_slot_hotplug_common(PCI_DEVICE(hotplug_dev), dev, &exp_cap, errp); + pcie_cap_slot_hotplug_common(pdev, dev, &exp_cap, errp); - pcie_cap_slot_push_attention_button(PCI_DEVICE(hotplug_dev)); + pcie_cap_slot_push_attention_button(pdev); } /* pci express slot for pci express root/downstream port @@ -408,7 +409,7 @@ void pcie_cap_slot_write_config(PCIDevice *dev, } /* - * If the slot is polulated, power indicator is off and power + * If the slot is populated, power indicator is off and power * controller is off, it is safe to detach the devices. */ if ((sltsta & PCI_EXP_SLTSTA_PDS) && (val & PCI_EXP_SLTCTL_PCC) && -- 2.4.3