From patchwork Thu Apr 4 01:04:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 233606 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 22C982C00B4 for ; Thu, 4 Apr 2013 12:07:12 +1100 (EST) Received: from localhost ([::1]:51852 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNYdy-0006E9-83 for incoming@patchwork.ozlabs.org; Wed, 03 Apr 2013 21:07:10 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43459) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNYdg-0006Dr-3U for qemu-devel@nongnu.org; Wed, 03 Apr 2013 21:06:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNYdb-0002Xz-Er for qemu-devel@nongnu.org; Wed, 03 Apr 2013 21:06:52 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:56147) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNYc0-0001ww-W1 for qemu-devel@nongnu.org; Wed, 03 Apr 2013 21:05:09 -0400 Received: by mail-pa0-f53.google.com with SMTP id bh4so1195171pad.12 for ; Wed, 03 Apr 2013 18:05:08 -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:in-reply-to:references:x-gm-message-state; bh=IQ0blKHNfuWzlOb2KCj+HTzNzKTDBPvjCRJ4N6NYy/M=; b=c4sDBKg1c7/GYAf4irV8PqUqAnvAFW0uvp2lqBnTF+Y25inSKFe5gTTsOKU7Qi6WGK tSkEu+AjWYLuw6AXowBu+RnQoY97PHvMW3B/EHFZUzDJKTpn7BeH6E3d0aH0iRg6EQoF hTU4hizOLYjZZO+Bm+AgbgGG76NsTbKF+7AjbUyDY4FKCaJNqJVg7Z8cvCMLaQBybDNB TDt0dh3f+xyu36RqquZHueWdvkCiBXKLAeMeWP9A93M1kvmuvNJ0TSEUBrMPfDlQW7BV 4f6U5s6nIwCuYjQLJx5QqeVwpC6y9wovfyu7w1qX2u7ONqOYFwtn0Hsmd/IQJPK17qlM Rx2A== X-Received: by 10.66.144.5 with SMTP id si5mr2927256pab.6.1365037508321; Wed, 03 Apr 2013 18:05:08 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPS id z1sm7921297pbw.19.2013.04.03.18.05.05 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Wed, 03 Apr 2013 18:05:07 -0700 (PDT) From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Thu, 4 Apr 2013 11:04:12 +1000 Message-Id: <4b1965545888d7bdc92a2073932f34f8d3f0294a.1365037290.git.peter.crosthwaite@xilinx.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQmraDDuuaZkIlm34fDxGc/3JgKpBwUGkGxJwHEsKYWIWWUqKXWWgggQbj5QHgp10MkTo+6j X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.220.53 Cc: qemu-trivial@nongnu.org, peter.maydell@linaro.org, Peter Crosthwaite , dantesu@faraday-tech.com, edgar.iglesias@gmail.com Subject: [Qemu-devel] [PATCH v1 2/2] 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 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/arm/xilinx_zynq.c | 3 +-- 1 files changed, 1 insertions(+), 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);