From patchwork Wed Dec 8 08:46:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 74655 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 62660B70B8 for ; Wed, 8 Dec 2010 19:52:25 +1100 (EST) Received: from localhost ([127.0.0.1]:34847 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PQFl8-0004sD-H1 for incoming@patchwork.ozlabs.org; Wed, 08 Dec 2010 03:52:22 -0500 Received: from [140.186.70.92] (port=43044 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PQFfe-0002DB-OB for qemu-devel@nongnu.org; Wed, 08 Dec 2010 03:46:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PQFfW-0000Yq-QF for qemu-devel@nongnu.org; Wed, 08 Dec 2010 03:46:42 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:47628) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PQFfW-0000YH-9e for qemu-devel@nongnu.org; Wed, 08 Dec 2010 03:46:34 -0500 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id 2465327FB9; Wed, 8 Dec 2010 17:46:33 +0900 (JST) Received: (nullmailer pid 32033 invoked by uid 1000); Wed, 08 Dec 2010 08:46:28 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org Date: Wed, 8 Dec 2010 17:46:27 +0900 Message-Id: <3f0bda9dcab9bba9a7c508930c7e8e8073827b99.1291797833.git.yamahata@valinux.co.jp> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: References: In-Reply-To: References: X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: yamahata@valinux.co.jp, mst@redhat.com Subject: [Qemu-devel] [PATTCH v2 5/6] pci/aer: remove dead code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Michael S. Tsirkin Remove some unused variables and return values. Signed-off-by: Michael S. Tsirkin Signed-off-by: Isaku Yamahata --- changes v1 -> v2: - reorder --- hw/pcie_aer.c | 25 ++----------------------- 1 files changed, 2 insertions(+), 23 deletions(-) diff --git a/hw/pcie_aer.c b/hw/pcie_aer.c index 389e9d5..0fb21ab 100644 --- a/hw/pcie_aer.c +++ b/hw/pcie_aer.c @@ -274,29 +274,21 @@ static uint32_t pcie_aer_status_to_cmd(uint32_t status) } /* - * return value: - * true: error message is sent up - * false: error message is masked - * * 6.2.6 Error Message Control * Figure 6-3 * root port part */ -static bool pcie_aer_msg_root_port(PCIDevice *dev, const PCIEAERMsg *msg) +static void pcie_aer_msg_root_port(PCIDevice *dev, const PCIEAERMsg *msg) { - bool msg_sent; uint16_t cmd; uint8_t *aer_cap; uint32_t root_cmd; uint32_t root_status, prev_status; - bool msi_trigger; - msg_sent = false; cmd = pci_get_word(dev->config + PCI_COMMAND); aer_cap = dev->config + dev->exp.aer_cap; root_cmd = pci_get_long(aer_cap + PCI_ERR_ROOT_COMMAND); prev_status = root_status = pci_get_long(aer_cap + PCI_ERR_ROOT_STATUS); - msi_trigger = false; if (cmd & PCI_COMMAND_SERR) { /* System Error. @@ -315,25 +307,14 @@ static bool pcie_aer_msg_root_port(PCIDevice *dev, const PCIEAERMsg *msg) if (root_status & PCI_ERR_ROOT_COR_RCV) { root_status |= PCI_ERR_ROOT_MULTI_COR_RCV; } else { - if (root_cmd & PCI_ERR_ROOT_CMD_COR_EN) { - msi_trigger = true; - } pci_set_word(aer_cap + PCI_ERR_ROOT_COR_SRC, msg->source_id); } root_status |= PCI_ERR_ROOT_COR_RCV; break; case PCI_ERR_ROOT_CMD_NONFATAL_EN: - if (!(root_status & PCI_ERR_ROOT_NONFATAL_RCV) && - root_cmd & PCI_ERR_ROOT_CMD_NONFATAL_EN) { - msi_trigger = true; - } root_status |= PCI_ERR_ROOT_NONFATAL_RCV; break; case PCI_ERR_ROOT_CMD_FATAL_EN: - if (!(root_status & PCI_ERR_ROOT_FATAL_RCV) && - root_cmd & PCI_ERR_ROOT_CMD_FATAL_EN) { - msi_trigger = true; - } if (!(root_status & PCI_ERR_ROOT_UNCOR_RCV)) { root_status |= PCI_ERR_ROOT_FIRST_FATAL; } @@ -360,10 +341,9 @@ static bool pcie_aer_msg_root_port(PCIDevice *dev, const PCIEAERMsg *msg) if (!(root_cmd & msg->severity) || (pcie_aer_status_to_cmd(prev_status) & root_cmd)) { /* Condition is not being set or was already true so nothing to do. */ - return msg_sent; + return; } - msg_sent = true; if (msix_enabled(dev)) { msix_notify(dev, pcie_aer_root_get_vector(dev)); } else if (msi_enabled(dev)) { @@ -371,7 +351,6 @@ static bool pcie_aer_msg_root_port(PCIDevice *dev, const PCIEAERMsg *msg) } else { qemu_set_irq(dev->irq[dev->exp.aer_intx], 1); } - return msg_sent; } /*