From patchwork Fri Apr 5 14:08:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 234148 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 A6A072C008F for ; Sat, 6 Apr 2013 01:11:27 +1100 (EST) Received: from localhost ([::1]:59571 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO7MT-0001wW-Qv for incoming@patchwork.ozlabs.org; Fri, 05 Apr 2013 10:11:25 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33668) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO7KI-0007TA-DL for qemu-devel@nongnu.org; Fri, 05 Apr 2013 10:09:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UO7K9-0008IX-Ti for qemu-devel@nongnu.org; Fri, 05 Apr 2013 10:09:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36090) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO7K9-0008IL-Mf for qemu-devel@nongnu.org; Fri, 05 Apr 2013 10:09:01 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r35E91gd014246 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 5 Apr 2013 10:09:01 -0400 Received: from localhost (ovpn-112-21.ams2.redhat.com [10.36.112.21]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r35E90Xc017826; Fri, 5 Apr 2013 10:09:00 -0400 From: Stefan Hajnoczi To: Date: Fri, 5 Apr 2013 16:08:46 +0200 Message-Id: <1365170926-6361-6-git-send-email-stefanha@redhat.com> In-Reply-To: <1365170926-6361-1-git-send-email-stefanha@redhat.com> References: <1365170926-6361-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Anthony Liguori , Peter Crosthwaite , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 5/5] xilinx_zynq: 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 From: Peter Crosthwaite 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 Signed-off-by: Stefan Hajnoczi --- hw/arm/xilinx_zynq.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 6f36286..5b9257a 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -86,8 +86,7 @@ static inline void zynq_init_spi_flashes(uint32_t base_addr, qemu_irq irq, spi = (SSIBus *)qdev_get_child_bus(dev, bus_name); for (j = 0; j < num_ss; ++j) { - flash_dev = ssi_create_slave_no_init(spi, "n25q128"); - qdev_init_nofail(flash_dev); + flash_dev = ssi_create_slave(spi, "n25q128"); cs_line = qdev_get_gpio_in(flash_dev, 0); sysbus_connect_irq(busdev, i * num_ss + j + 1, cs_line);