From patchwork Wed Jun 3 13:08:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 49460 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5C22C20BE7 for ; Wed, 3 Jun 2015 13:18:56 +0000 (UTC) Received: by lbcue7 with SMTP id ue7sf2691116lbc.3 for ; Wed, 03 Jun 2015 06:18:55 -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=0ZlAgXfAQDaBKRRw1YpXe3FgdmHLi+Lrasiv97uGwUo=; b=CP+tlc+oOsxL7qJY9+j0YNhyS+3qWN6P5xkKaGADcYa4DoWNxG4S90RgYeLIBgprEH ERtwww/sx3QO1URaTeHNcQLPOL1y4RGLq30tjmGRe7qZq2ekMlpRcApIJ5fnPa7MBS9d vH5EjcKsjYZZK1z7KUO242o5PdxreBEbtYp4nrsP5tgKZPgWCVJUYl4bEnL01rperQdB 0oXRG9trVaNvJfztNpuycOzatD0saIfrXnU46F3Ie7412+TorMeFFobq8uk46N4Bru4Z ef27KQNZeem3A8ctfIy6hAu0oGjdshB8Y+By2XGqI3mm95Z42hnlAmziWdDh2sXybqJM He+w== X-Gm-Message-State: ALoCoQk8F+2DpeQBuXa9KdI00NVRmK+QnYso+TO/KO0SVQQIb3GXKsrJE2IY5yFwdyecd8w1mLog X-Received: by 10.113.11.3 with SMTP id ee3mr30966744lbd.9.1433337535299; Wed, 03 Jun 2015 06:18:55 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.203.133 with SMTP id kq5ls52892lac.102.gmail; Wed, 03 Jun 2015 06:18:55 -0700 (PDT) X-Received: by 10.152.2.38 with SMTP id 6mr23301372lar.80.1433337535152; Wed, 03 Jun 2015 06:18:55 -0700 (PDT) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id xd3si17995354lbb.166.2015.06.03.06.18.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jun 2015 06:18:55 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by labko7 with SMTP id ko7so7838800lab.2 for ; Wed, 03 Jun 2015 06:18:55 -0700 (PDT) X-Received: by 10.152.29.161 with SMTP id l1mr31656656lah.76.1433337534966; Wed, 03 Jun 2015 06:18:54 -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 hn6csp3862872lbb; Wed, 3 Jun 2015 06:18:53 -0700 (PDT) X-Received: by 10.55.18.155 with SMTP id 27mr59554420qks.36.1433337533299; Wed, 03 Jun 2015 06:18:53 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b102si557861qga.35.2015.06.03.06.18.52 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 03 Jun 2015 06:18:53 -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]:35469 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z08ZI-00028E-49 for patch@linaro.org; Wed, 03 Jun 2015 09:18:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z08XF-0006zQ-3g for qemu-devel@nongnu.org; Wed, 03 Jun 2015 09:16:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z08X5-0004Lh-3J for qemu-devel@nongnu.org; Wed, 03 Jun 2015 09:16:45 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:55386) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z08X4-0004Kl-RX; 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 80694407A4; 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 AEB4EA5A; Wed, 3 Jun 2015 16:08:53 +0300 (MSK) Received: (nullmailer pid 27461 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:44 +0300 Message-Id: <294972ce546107f2215b3b162994b47f08aab7a4.1433336870.git.mjt@msgid.tls.msk.ru> 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 24/30] hw/arm/nseries.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.42 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 Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao Signed-off-by: Michael Tokarev --- hw/arm/nseries.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index d243159..a659e85 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -133,9 +133,8 @@ static void n800_mmc_cs_cb(void *opaque, int line, int level) static void n8x0_gpio_setup(struct n800_s *s) { - qemu_irq *mmc_cs = qemu_allocate_irqs(n800_mmc_cs_cb, s->mpu->mmc, 1); - qdev_connect_gpio_out(s->mpu->gpio, N8X0_MMC_CS_GPIO, mmc_cs[0]); - + qdev_connect_gpio_out(s->mpu->gpio, N8X0_MMC_CS_GPIO, + qemu_allocate_irq(n800_mmc_cs_cb, s->mpu->mmc, 0)); qemu_irq_lower(qdev_get_gpio_in(s->mpu->gpio, N800_BAT_COVER_GPIO)); }