From patchwork Mon Oct 29 19:00:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 10660157 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0FDCD13BF for ; Mon, 29 Oct 2018 19:24:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 09D1A28C05 for ; Mon, 29 Oct 2018 19:24:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF36729F68; Mon, 29 Oct 2018 19:24:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 88E8028C05 for ; Mon, 29 Oct 2018 19:24:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=EajIXMLj7mNLnd9o/MbWqql9UA2/dIUEb2LPYSgJWvg=; b=EGpkU5HL307vOyOYLygmV6ezFK /ggL8jsi93JPrQMk1Qs5vXf1w37xrZ6kz5MGBolVmPSz09Ap0zE2JJgmVtuenBBWOryGnnQNrBkIq sts6Pp38BiVFauV0qINzgYglWN+HNQrvjOIDyd2ya/Xd+VGQPUkwpuvqcgYwwAdOAJtyU5/QW2EdS o8P0X94Q8lQ/b5/G4lL037u/l7dPxTU4MTXtJKmU1/Xp27l2f9bwqP1LfWbzB22SeVEz1ZJgI2/wQ iU9KvPLfQenYAoLSQGIdH5QLas4VMUP4A8eoaFkYj/AuCo4rk7cVKoZtK9Pg2lGLoct6yh650DYaP fccBv8kg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gHD9B-0002mj-2X; Mon, 29 Oct 2018 19:24:21 +0000 Received: from mail-yw1-xc42.google.com ([2607:f8b0:4864:20::c42]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gHD8d-0002W0-9e for linux-arm-kernel@lists.infradead.org; Mon, 29 Oct 2018 19:23:55 +0000 Received: by mail-yw1-xc42.google.com with SMTP id v199-v6so3874699ywg.1 for ; Mon, 29 Oct 2018 12:23:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YL0HdZkPCdw1CCL6gh+aOFZfOsDccPVqMbEblUSgKXk=; b=t3hWFQZXTa3gdT8u5roAeXBpOVMmucs7Sml7jofbKrNFaCyk3Wk07zYk2+RpOralEw YPeEPdMvHXTLGZkds4fJZgc8zKxDFkbHS06tZjP3oNOhRIHs1BEJOU0dHCAShOtsjjZo dAWaRZacS13+qj7UyhjfIaahpmiJ3RQKFLzhgcwBBmKIi4heAiPbT3Aknsw/G1ckMpLx jFVb4d3FL2ST4Pa/HUdQ6dFZ9M7Hbc0qW1oaD8WseJnD8N+X/XCoH8YxH7dv7HyvCN87 BXaBVGZGr1QAs/MIOEDq4bj2lVuUQDW0aHT/XcShKyxFjRF9gyU3VP156CU1elPTbhW9 DFZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YL0HdZkPCdw1CCL6gh+aOFZfOsDccPVqMbEblUSgKXk=; b=q1R25BC6R48WJxcwXGQkOtJLjzekP0dhj3ydtHwlZNBtpfyI9gNhcFFUELzkIB0QjC LSns+7RMJgzV0wscObfBUG/iNRCKrpL29N33z6i1Uqssuanh/Vb9J13AGUfgQqz0ZPIY 8iBYLR0nZvNRzlMd2JO5xTzx8736Lnp5K+94ZUjbSwcLxA0mACPEqHpiSni4WEJXfbyY 6p9bhLf/SuTCGfHyEXJbVCQCjWtQveA8ADkfUk9tzn3rxJtJdJadGsOTWqK4mowqA8QR c1p52NV6cMzuNuMzBNhWqkaA1UIXLuyT++oL/WzbGUsWfqzsh2zntx71nnPcMgAKVzVv 8/JA== X-Gm-Message-State: AGRZ1gJeEdolWDHtcFao/wPW2X/CQcXsTzWtGzUkW2rLK6QbRAtmwDQV taT8/09jSlFOLByYf3l8lzQ= X-Google-Smtp-Source: AJdET5cgRCqX84F0H+HUxaYu2M5Bp0gYI/v2sSKNjUsmqEqtruOiIQpOjlJ+xeWQt7SpUYFNQVYPWw== X-Received: by 2002:a0d:d205:: with SMTP id u5-v6mr15271650ywd.427.1540841015022; Mon, 29 Oct 2018 12:23:35 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id k85-v6sm5410014ywa.76.2018.10.29.12.23.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Oct 2018 12:23:33 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Subject: [PATCH 2/2 v5] of/fdt: Remove definition check for __early_init_dt_declare_initrd() Date: Mon, 29 Oct 2018 12:00:14 -0700 Message-Id: <20181029190014.6455-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181029190014.6455-1-f.fainelli@gmail.com> References: <20181029190014.6455-1-f.fainelli@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181029_122347_388912_24806C0F X-CRM114-Status: GOOD ( 13.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: CHANDAN VN , Catalin Marinas , Will Deacon , Stefan Agner , Masahiro Yamada , Frank Rowand , Florian Fainelli , linux@armlinux.org.uk, rppt@linux.ibm.com, Andrey Ryabinin , Laura Abbott , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE" , Marc Zyngier , Andrey Konovalov , Kristina Martsenko , Russell King , Rob Herring , "moderated list:ARM64 PORT AARCH64 ARCHITECTURE" , Johannes Weiner , Andrew Morton , Robin Murphy , Greg Hackmann MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP With the one and only architecture (ARM64) no longer defining a custom __early_init_dt_declare_initrd() function, just get rid of the check for that function being already defined. Signed-off-by: Florian Fainelli --- drivers/of/fdt.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 76c83c1ffeda..0f6430265e4d 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -892,7 +892,6 @@ const void * __init of_flat_dt_match_machine(const void *default_match, } #ifdef CONFIG_BLK_DEV_INITRD -#ifndef __early_init_dt_declare_initrd static void __early_init_dt_declare_initrd(unsigned long start, unsigned long end) { @@ -900,7 +899,6 @@ static void __early_init_dt_declare_initrd(unsigned long start, initrd_end = (unsigned long)__va(end); initrd_below_start_ok = 1; } -#endif /** * early_init_dt_check_for_initrd - Decode initrd location from flat tree