From patchwork Thu Apr 4 01:04:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 233605 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 03ADC2C008D for ; Thu, 4 Apr 2013 12:05:14 +1100 (EST) Received: from localhost ([::1]:50356 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNYc4-0005Fz-6w for incoming@patchwork.ozlabs.org; Wed, 03 Apr 2013 21:05:12 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42993) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNYbe-0005DW-K5 for qemu-devel@nongnu.org; Wed, 03 Apr 2013 21:04:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNYbR-0001Zo-Mf for qemu-devel@nongnu.org; Wed, 03 Apr 2013 21:04:46 -0400 Received: from mail-pb0-f48.google.com ([209.85.160.48]:36006) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNYbR-0001ZN-DM for qemu-devel@nongnu.org; Wed, 03 Apr 2013 21:04:33 -0400 Received: by mail-pb0-f48.google.com with SMTP id xb4so1133971pbc.7 for ; Wed, 03 Apr 2013 18:04:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=vu2YsGfaZ3a34fDvHn7+y46kevsBv1pQNv55+EqWxeE=; b=f/JexoUgOfEYo9O/RA4+9h4YLc9DtbWvugJis9txnJHAuKQ2DVaP2xKrWHwkx/jOCF 2m3Bbsfum9H4JTdvPV9CxyqKrNm55Ak9fpSVKOyo9RPnD411ygAJOCyDmNOADpI6pfsn KpWc0vKX+BmdiCYrh3Howq/LZDwywI5MuAlECUinX4grBeJfk8EpfSQQ4wpI5s8HmlLT 01AKyAqt24Rha72s51q1vgpIuZeOTTtml6c/nWAlCtXGpn1jjexxz7oVk+e/JQERr7d0 6zWJUhJvamYxMXEEo9256rQJm6WtVaCyvI4U8nZxFxP6PCe/36kKXMVzx8BhF2e9ACzB 0f/A== X-Received: by 10.68.213.132 with SMTP id ns4mr6047774pbc.84.1365037472551; Wed, 03 Apr 2013 18:04:32 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPS id in5sm7918188pbc.20.2013.04.03.18.04.30 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Wed, 03 Apr 2013 18:04:31 -0700 (PDT) From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Thu, 4 Apr 2013 11:04:11 +1000 Message-Id: X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: X-Gm-Message-State: ALoCoQk5AMCMQvgpMHGoI/98LxXTebz86Tc2Gjwr/pKRr3xyr1gUgG0UP/5c0kx3UT2Ew+0B1D3Y X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.160.48 Cc: qemu-trivial@nongnu.org, peter.maydell@linaro.org, Peter Crosthwaite , dantesu@faraday-tech.com, edgar.iglesias@gmail.com Subject: [Qemu-devel] [PATCH v1 1/2] petalogix_ml605_mmu: Cleanup ssi_create_slave() 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 With the recent m25p80 cleanup there is no need to use ssi_create_slave_no_init() anymore. Just use ssi_create_slave(). Signed-off-by: Peter Crosthwaite --- hw/microblaze/petalogix_ml605_mmu.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c index cfc0220..07dc808 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -158,8 +158,7 @@ petalogix_ml605_init(QEMUMachineInitArgs *args) for (i = 0; i < NUM_SPI_FLASHES; i++) { qemu_irq cs_line; - dev = ssi_create_slave_no_init(spi, "n25q128"); - qdev_init_nofail(dev); + dev = ssi_create_slave(spi, "n25q128"); cs_line = qdev_get_gpio_in(dev, 0); sysbus_connect_irq(busdev, i+1, cs_line); }