]> git.proxmox.com Git - qemu.git/commitdiff
xilinx_zynq: Cleanup ssi_create_slave
authorPeter Crosthwaite <peter.crosthwaite@xilinx.com>
Thu, 4 Apr 2013 01:04:12 +0000 (11:04 +1000)
committerStefan Hajnoczi <stefanha@redhat.com>
Fri, 5 Apr 2013 13:04:10 +0000 (15:04 +0200)
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 <peter.crosthwaite@xilinx.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
hw/arm/xilinx_zynq.c

index 6f362865f97f331f078fde22b97727389d8662e9..5b9257a9de6673883052e14cac67ab7c046056f4 100644 (file)
@@ -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);