From patchwork Wed Apr 21 14:03:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 12216191 X-Patchwork-Delegate: bhelgaas@google.com 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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 C2CF3C433B4 for ; Wed, 21 Apr 2021 14:03:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7F8D06144D for ; Wed, 21 Apr 2021 14:03:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243185AbhDUOEU (ORCPT ); Wed, 21 Apr 2021 10:04:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:39210 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243236AbhDUOEN (ORCPT ); Wed, 21 Apr 2021 10:04:13 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9399C6144B; Wed, 21 Apr 2021 14:03:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619013820; bh=JecW3OWOa/52Dy6/jTvDzbnxIVJGN4rSAt7UZvBojxg=; h=From:To:Cc:Subject:Date:From; b=LjZ0xP/zaAXt7qtNqHNBh1eEgA3HKE6JCW5HZI0nT83VAQeoLypsrlm9rNcjjgBgR 6IfUlQ+JKY2KHb2LZFiN2GHqSflzwAYgSMuWozwAd+CzfbSvvQgDcU+03SzsgS2JRP mR4TgMKitfIGTwW7P64BZEJyhUtq4fKnvSqBvDTTCYj858HQGJiS2Gd7QIwnSkTWRE wMogR7uQq4Phj1qq87v/8UZddeEtqyRelGbt3NdwQhp5MaCUgzMj7smLbbAA8bZ46f fRglqtaxL9nYUXV5gIKQBOgpHMq98pJ8qY/y/g8VYTVuH7IyKe06jkz6KpFk/AJJMF 7enzmUMhfPXeQ== From: Arnd Bergmann To: Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Heiner Kallweit Cc: Arnd Bergmann , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] PCI/VPD: fix unused pci_vpd_set_size function warning Date: Wed, 21 Apr 2021 16:03:27 +0200 Message-Id: <20210421140334.3847155-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Arnd Bergmann The only user of this function is now in an #ifdef, causing a warning when that symbol is not defined: drivers/pci/vpd.c:289:13: error: 'pci_vpd_set_size' defined but not used [-Werror=unused-function] 289 | static void pci_vpd_set_size(struct pci_dev *dev, size_t len) Move the function into that #ifdef block. Fixes: f349223f076e ("PCI/VPD: Remove pci_set_vpd_size()") Signed-off-by: Arnd Bergmann Reviewed-by: Krzysztof Wilczyński Reviewed-by: Geert Uytterhoeven --- drivers/pci/vpd.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/pci/vpd.c b/drivers/pci/vpd.c index 6909253bb13c..ee8c41a88548 100644 --- a/drivers/pci/vpd.c +++ b/drivers/pci/vpd.c @@ -286,17 +286,6 @@ static ssize_t pci_vpd_write(struct pci_dev *dev, loff_t pos, size_t count, return ret ? ret : count; } -static void pci_vpd_set_size(struct pci_dev *dev, size_t len) -{ - struct pci_vpd *vpd = dev->vpd; - - if (!vpd || len == 0 || len > PCI_VPD_MAX_SIZE) - return; - - vpd->valid = 1; - vpd->len = len; -} - static const struct pci_vpd_ops pci_vpd_ops = { .read = pci_vpd_read, .write = pci_vpd_write, @@ -482,6 +471,17 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_QLOGIC, 0x2261, quirk_blacklist_vpd); DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS, 0x0031, PCI_CLASS_BRIDGE_PCI, 8, quirk_blacklist_vpd); +static void pci_vpd_set_size(struct pci_dev *dev, size_t len) +{ + struct pci_vpd *vpd = dev->vpd; + + if (!vpd || len == 0 || len > PCI_VPD_MAX_SIZE) + return; + + vpd->valid = 1; + vpd->len = len; +} + static void quirk_chelsio_extend_vpd(struct pci_dev *dev) { int chip = (dev->device & 0xf000) >> 12;