From patchwork Fri Sep 21 02:42:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 972815 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42GdDr1bNrz9sD2 for ; Fri, 21 Sep 2018 12:42:52 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HbR+MGjo"; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 42GdDq615RzF3PJ for ; Fri, 21 Sep 2018 12:42:51 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HbR+MGjo"; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::544; helo=mail-pg1-x544.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HbR+MGjo"; dkim-atps=neutral Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 42GdDh1lrPzF3P8 for ; Fri, 21 Sep 2018 12:42:43 +1000 (AEST) Received: by mail-pg1-x544.google.com with SMTP id d1-v6so5334401pgo.3 for ; Thu, 20 Sep 2018 19:42:43 -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; bh=PHKQVR1152+bUHmaotTJ9TJbkK0uEZoIMylbj4fYqAE=; b=HbR+MGjo3A6f2vn6sujVOfKvVUEs4bOl/bNU/X6OfF8IZR6qQKZmOz9D8EMuW9NBSp JqtSunuAc4Zzgp9pxbaxzG67kSXR8azCpUSGjziwOWvwLV/MFWAY9F+BVJoQsw83cp9N WKU98pNvjzKirtCtHKuHCz3z9dDs9DyXgGfqxjwYFrHXCknsFC/bfwGzQ+nu50ao5bbH D+HpPUaavj++cGXq+HqiYadjPhrusIIRlvrs4UicYbGHJ5OINkqCid+81zbmbQ4R1BsS tJNomFs1k5xf0MuU7Oeqg+5wAewxhn96SyCCaG+XcyO4GQldlOPJeJ8UcESeSGEQuoZH Tu7A== 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; bh=PHKQVR1152+bUHmaotTJ9TJbkK0uEZoIMylbj4fYqAE=; b=E6uS5U2jatgbOL9kOQ0YRr2Hi6KiRLFz2ec7qQUbcoUfTlUohONjaFU1BP1C8mKniW +eRtmsizwewdyMhPBiAcgUc+Q3N4osgCNdtHxidptuxJURhORoUbkBnpRKif+1ApYYiU 1hFRmUJAQiBXuPtnysRoXKHxpA9hIT8FKwDIxGXgpeAmNK5lOhEQL36EOQf/12uiqRCc zF1qNxdZ9NcBaYkw/w6k0AouQ9MCK/ibjEDA78JXBCPMK6fn2Lfkx2QnaMleLwiNuy5K 7VuTW91RwSSmNbDc+oZilqSHJ2FluQb5Ju/EyYhUKy6Bm9BuqBRXWOEc0JLwmNkQA/ll bv8Q== X-Gm-Message-State: APzg51A+8QYjWWSaVgAF41PJrR5AiRUUr5wzEPEt87w8IsQuPtXFCGpo 7Rm/VpU8NIdmHtg+TDg9CFOK6whf X-Google-Smtp-Source: ANB0VdbmFt5TrI+MTmtaGB+gmB5tm8KfuwOZc9azMFuDrMxdHwYjMCIaeszj7XQrQVf4Sb3vfBHIcQ== X-Received: by 2002:a63:e0e:: with SMTP id d14-v6mr37626501pgl.38.1537497761966; Thu, 20 Sep 2018 19:42:41 -0700 (PDT) Received: from flat-canetoad.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id w5-v6sm30320892pfn.44.2018.09.20.19.42.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Sep 2018 19:42:41 -0700 (PDT) From: Oliver O'Halloran To: skiboot@lists.ozlabs.org Date: Fri, 21 Sep 2018 12:42:30 +1000 Message-Id: <20180921024230.3191-1-oohall@gmail.com> X-Mailer: git-send-email 2.9.5 Subject: [Skiboot] [PATCH] witherspoon: Rename shared slot fixup function X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Rename and set it as a pre_pci_fixup platform function. The indirect call doesn't make a whole of of sense IMO. Signed-off-by: Oliver O'Halloran --- platforms/astbmc/witherspoon.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/platforms/astbmc/witherspoon.c b/platforms/astbmc/witherspoon.c index de087045542c..0b5590671da6 100644 --- a/platforms/astbmc/witherspoon.c +++ b/platforms/astbmc/witherspoon.c @@ -142,7 +142,7 @@ static void phb4_activate_shared_slot_witherspoon(struct proc_chip *chip) prlog(PR_INFO, "Shared PCI slot activated\n"); } -static void phb4_pre_pci_fixup_witherspoon(void) +static void witherspoon_shared_slot_fixup(void) { struct pci_slot *slot0, *slot1; struct proc_chip *chip0, *chip1; @@ -204,11 +204,6 @@ static void phb4_pre_pci_fixup_witherspoon(void) } } -static void witherspoon_pre_pci_fixup(void) -{ - phb4_pre_pci_fixup_witherspoon(); -} - static void set_link_details(struct npu2 *npu, uint32_t link_index, uint32_t brick_index, enum npu2_dev_type type) { @@ -356,7 +351,7 @@ DECLARE_PLATFORM(witherspoon) = { .name = "Witherspoon", .probe = witherspoon_probe, .init = astbmc_init, - .pre_pci_fixup = witherspoon_pre_pci_fixup, + .pre_pci_fixup = witherspoon_shared_slot_fixup, .start_preload_resource = flash_start_preload_resource, .resource_loaded = flash_resource_loaded, .bmc = &astbmc_openbmc,