From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Stefan Hajnoczi 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> Subject: [Qemu-devel] [PATCH 5/5] xilinx_zynq: Cleanup ssi_create_slave List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Peter Crosthwaite , Stefan Hajnoczi 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); -- 1.8.1.4