From patchwork Wed Jun 3 13:08:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 49459 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EA1A720BE7 for ; Wed, 3 Jun 2015 13:18:54 +0000 (UTC) Received: by wibbk2 with SMTP id bk2sf5261340wib.2 for ; Wed, 03 Jun 2015 06:18:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=rtVh2aIH7cQHhaGgCdhNyDkcS0NDvuYaMzV7MK6E1YI=; b=iHWmNW7/WMVjwxvf/uHfr4K0o7QOgCWJYwmP2EctAQeXmdvebRbAN6Tm+oIkUb2GpE xJEjEzUPwHH65uylBWIEFf4q/RVAEZYO1J7uiCtu/wY1hWRBC1M91Z+9SVOCiJ1hnUE9 8o0OLyATwshgs855orTzgVZtS7NYBK+y1YBdGKTh9PklPC2uecD1IHMLcjCclgcLO+2W HvfN5ScYsZLnAlw1q2KB1qQbyNeUrT3juVzKDRvK9ItxxuqaqYPgTvoFLzUbrxclCOee Qy70NWi6HlUFEIchXDb7hMx3oD+EtxhobavcSMn93VykORoIKV66XAyapa78Hd2z3X0X NUTA== X-Gm-Message-State: ALoCoQlmbIMIeFtLJ7qhqrrBZgx1qmNbjQaxCn6Rie83CIQvZfSUUmCL2asUR5Bp7puCGL+O/lYI X-Received: by 10.152.87.140 with SMTP id ay12mr21210099lab.1.1433337533973; Wed, 03 Jun 2015 06:18:53 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.9.200 with SMTP id c8ls53779lab.81.gmail; Wed, 03 Jun 2015 06:18:53 -0700 (PDT) X-Received: by 10.112.137.1 with SMTP id qe1mr31169721lbb.22.1433337533827; Wed, 03 Jun 2015 06:18:53 -0700 (PDT) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id lf11si9187265lac.125.2015.06.03.06.18.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jun 2015 06:18:53 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by labpy14 with SMTP id py14so7895156lab.0 for ; Wed, 03 Jun 2015 06:18:53 -0700 (PDT) X-Received: by 10.153.6.36 with SMTP id cr4mr32598121lad.56.1433337533410; Wed, 03 Jun 2015 06:18:53 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp3862853lbb; Wed, 3 Jun 2015 06:18:52 -0700 (PDT) X-Received: by 10.55.15.87 with SMTP id z84mr58863243qkg.57.1433337531628; Wed, 03 Jun 2015 06:18:51 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id p86si557109qkh.51.2015.06.03.06.18.50 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 03 Jun 2015 06:18:51 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:35468 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z08ZG-00024v-KH for patch@linaro.org; Wed, 03 Jun 2015 09:18:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34979) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z08X9-0006ud-4y for qemu-devel@nongnu.org; Wed, 03 Jun 2015 09:16:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z08X5-0004LS-2O for qemu-devel@nongnu.org; Wed, 03 Jun 2015 09:16:39 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:49982) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z08X4-0004Kp-RS; Wed, 03 Jun 2015 09:16:35 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 71F1640787; Wed, 3 Jun 2015 16:16:33 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id DB82DA66; Wed, 3 Jun 2015 16:08:54 +0300 (MSK) Received: (nullmailer pid 27443 invoked by uid 1000); Wed, 03 Jun 2015 13:08:52 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Wed, 3 Jun 2015 16:08:35 +0300 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 86.62.121.231 Cc: qemu-trivial@nongnu.org, Michael Tokarev , Shannon Zhao , Shannon Zhao Subject: [Qemu-devel] [PULL 15/30] hw/isa/lpc_ich9.c: Fix misusing qemu_allocate_irqs for single irq X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: mjt@tls.msk.ru X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Shannon Zhao Since ich9_lpc_pm_init only requests one irq, so let it just call qemu_allocate_irq. Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao Signed-off-by: Michael Tokarev --- hw/isa/lpc_ich9.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index dba7585..144b210 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -360,11 +360,8 @@ static void ich9_set_sci(void *opaque, int irq_num, int level) void ich9_lpc_pm_init(PCIDevice *lpc_pci) { ICH9LPCState *lpc = ICH9_LPC_DEVICE(lpc_pci); - qemu_irq *sci_irq; - - sci_irq = qemu_allocate_irqs(ich9_set_sci, lpc, 1); - ich9_pm_init(lpc_pci, &lpc->pm, sci_irq[0]); + ich9_pm_init(lpc_pci, &lpc->pm, qemu_allocate_irq(ich9_set_sci, lpc, 0)); ich9_lpc_reset(&lpc->d.qdev); }