From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 672D8C2BA17 for ; Mon, 6 Apr 2020 18:00:24 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 375DF20678 for ; Mon, 6 Apr 2020 18:00:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hJoJZxcd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 375DF20678 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLW2p-00074F-Ac for qemu-devel@archiver.kernel.org; Mon, 06 Apr 2020 14:00:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36222) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLVr6-00022p-8G for qemu-devel@nongnu.org; Mon, 06 Apr 2020 13:48:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jLVr5-0002r3-4a for qemu-devel@nongnu.org; Mon, 06 Apr 2020 13:48:16 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:36678) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jLVr4-0002nm-QM; Mon, 06 Apr 2020 13:48:15 -0400 Received: by mail-wr1-x42c.google.com with SMTP id k1so525916wrm.3; Mon, 06 Apr 2020 10:48:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f8mojAlRUdlR/2NknA9ZDyMqw2xlNW4cv+f7vBTxHaE=; b=hJoJZxcd34zsuU0v1gVS9Y4MNUJa2LMTMLbZkQUitYNiXClddzjmaHoY3wWLgi3IKe EH7pj29KBqzD2wKlnxefJMIekbas+uPO7e0MVEiN1T185ILeEP4gmriiRLRBzrxLvu1N dUjr51JddnjczJbzdZKGToKm8DV8OkeD8QosXTIVCglyHUU5oC2D/xBjKj4P56Td8Fa3 g8FZ3Yh6YBKtv1ypknakKKOCnM6QsbxXMW+PdsZNGuBh5L/MbY4cg2H22dC+4xBxzfIZ wWu/x75aIPjerF0Qixo6LU9L//3zaLDKpQeYksRLl+zyOOkFRchiUwSiRJE4DJSW4/7t mkow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=f8mojAlRUdlR/2NknA9ZDyMqw2xlNW4cv+f7vBTxHaE=; b=eJCZTsSJ3hYp6nY1upR0xffKAlOBJsx7Md8bkEf7rz/98IVVXdugkrgEQi/tsezAiw qQLt0Qq4f9ld+UWRw0QmLk7rXu/I/RLTu7An/ebkKRZ/4mjmplJhHiZsYzHGd3k8qaFB Z9/liEKqPeK3/7r3vnK+va+3Oi6lTVx+5RIYLfeik18YUilNzo+rwNM9738+shs0IweV SEoo+mkOUyOJGpj3aQ2ZiaFuegQcmORmq/kysFNoeo9cFyyF6RYZjaneyDJZ4/hCUkVt FotlKZGcSvFaKk1snTLKXlgnd9Fjwpj6ORo5gG4pkKsgqMhkUUP1fsjFev/fv2NOEcCV 53Uw== X-Gm-Message-State: AGi0PuZ/gPpaxvYGBRy9KunWE2NfJe8bewGe9rOkzyzTYCFoqgGQUubF KdUOq6/6aNPUYwQ5Bo/5PFRCbd1HAt4= X-Google-Smtp-Source: APiQypJqBpOi+9r+z/9YPYz9GQ1Rwl65GmEs2BgPB5b+NSkST2noha/gz7EIEWRs7pUFNVLeGBOccg== X-Received: by 2002:a5d:410a:: with SMTP id l10mr316382wrp.355.1586195293285; Mon, 06 Apr 2020 10:48:13 -0700 (PDT) Received: from x1w.redhat.com (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id a67sm364880wmc.30.2020.04.06.10.48.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2020 10:48:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Markus Armbruster Subject: [PATCH-for-5.1 v2 20/54] hw/riscv/sifive_u: Use single type_init() Date: Mon, 6 Apr 2020 19:47:09 +0200 Message-Id: <20200406174743.16956-21-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200406174743.16956-1-f4bug@amsat.org> References: <20200406174743.16956-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Vladimir Sementsov-Ogievskiy , "open list:RISC-V TCG CPUs" , Sagar Karandikar , Bastian Koppelmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , Palmer Dabbelt Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We can use a single type_init() to call multiple type_register*(). Signed-off-by: Philippe Mathieu-Daudé --- hw/riscv/sifive_u.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 998666c91f..9c90c94c33 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -601,13 +601,6 @@ static const TypeInfo riscv_sifive_u_soc_type_info = { .class_init = riscv_sifive_u_soc_class_init, }; -static void riscv_sifive_u_soc_register_types(void) -{ - type_register_static(&riscv_sifive_u_soc_type_info); -} - -type_init(riscv_sifive_u_soc_register_types) - static void riscv_sifive_u_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -627,9 +620,10 @@ static const TypeInfo riscv_sifive_u_machine_typeinfo = { .instance_size = sizeof(SiFiveUState), }; -static void riscv_sifive_u_machine_init_register_types(void) +static void riscv_sifive_u_register_types(void) { + type_register_static(&riscv_sifive_u_soc_type_info); type_register_static(&riscv_sifive_u_machine_typeinfo); } -type_init(riscv_sifive_u_machine_init_register_types) +type_init(riscv_sifive_u_register_types) -- 2.21.1