From patchwork Mon Jan 7 15:38:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 209968 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 806AD2C0085 for ; Tue, 8 Jan 2013 03:11:51 +1100 (EST) Received: from localhost ([::1]:52297 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsEnk-0005Qd-RG for incoming@patchwork.ozlabs.org; Mon, 07 Jan 2013 10:39:48 -0500 Received: from eggs.gnu.org ([208.118.235.92]:40857) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsEn7-0004Gv-FK for qemu-devel@nongnu.org; Mon, 07 Jan 2013 10:39:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TsEn5-00074J-NZ for qemu-devel@nongnu.org; Mon, 07 Jan 2013 10:39:09 -0500 Received: from cantor2.suse.de ([195.135.220.15]:39861 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsEn5-000748-FT; Mon, 07 Jan 2013 10:39:07 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id F1AC5A4F28; Mon, 7 Jan 2013 16:39:06 +0100 (CET) From: Alexander Graf To: qemu-devel@nongnu.org Date: Mon, 7 Jan 2013 16:38:34 +0100 Message-Id: <1357573140-8877-6-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1357573140-8877-1-git-send-email-agraf@suse.de> References: <1357573140-8877-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: Blue Swirl , Scott Wood , qemu-ppc@nongnu.org, Aurelien Jarno Subject: [Qemu-devel] [PATCH 05/31] openpic: s/opp->nb_irqs -1/opp->nb_cpus - 1/ 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Scott Wood "opp->nb_irqs-1" would have been a minor coding style error, but putting in one space but not the other makes it look confusingly like a numeric literal "-1". Signed-off-by: Scott Wood Signed-off-by: Alexander Graf --- hw/openpic.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/openpic.c b/hw/openpic.c index 337dbf5..10dbdf7 100644 --- a/hw/openpic.c +++ b/hw/openpic.c @@ -440,8 +440,8 @@ static void openpic_reset(DeviceState *d) opp->glbc = GLBC_RESET; /* Initialise controller registers */ - opp->frep = ((opp->nb_irqs -1) << FREP_NIRQ_SHIFT) | - ((opp->nb_cpus -1) << FREP_NCPU_SHIFT) | + opp->frep = ((opp->nb_irqs - 1) << FREP_NIRQ_SHIFT) | + ((opp->nb_cpus - 1) << FREP_NCPU_SHIFT) | (opp->vid << FREP_VID_SHIFT); opp->pint = 0;