From patchwork Tue May 16 20:14:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 94930 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp682748vqo; Tue, 16 May 2023 13:28:15 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4435rmOnJqIGiq3z5QnZXAMrM1v7QfYbAc8DUM6e+eiBMZNeLLpyKzOdgeMOwdTgKcDuP/ X-Received: by 2002:a05:6a20:9189:b0:106:ff3c:a60d with SMTP id v9-20020a056a20918900b00106ff3ca60dmr3810937pzd.38.1684268895157; Tue, 16 May 2023 13:28:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684268895; cv=none; d=google.com; s=arc-20160816; b=bwNErrYxSeAeDH2LXvJxvwhBP6Ijwxz+TNVRw7CccEr+j2v330b83aN6JHBF7L1irE /PxqdBy022bQVjWfDuGeaw2YdMYWEufI5RnFSAfYsSW1hQcYkKgH3lmf4LrwywavFd7g kt4vi1yJaO4iyGc2pPOvtaVkPxH0bUEEG6ZFzrQgrccSKWak+mpoXlqrdoZlUcgt0BB3 EQKKxRjJEBmTVScXDGAB7ZplwqtbVhJEyEptqBsCY25ghdJBB4GBMyHsGLPuIwoQt29J d0Wj+DDKC6zh0Wf8xEowyCSGJHQuvd8NwNIhk5FrJrzn85jbaS1kIgT8bBlcXvTS5ltZ B1Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=XB6N+r412V3Dq1rl81E0nMZVd7rv6dLMvHetVMLJQ3I=; b=WdeYC920YOT1EOQ8WR1IIbK5uuvIGebISSFv4e8eyUiGhZ7VbxHJRoJxXqMLHpthsA 1Ui+5q6N/NNdOks4tYOIQYHaDV9OJAOGg2kUvXEce051wIebeaNjGEt8F54lgjgmU1A2 dgPjEHqTqMXxDeGX79XRIPs/k0kspXlS2efcxuL7x3wBte8ZLPUamhPRn7qAX67LQiwS 2uxXeVQivIR892ZIAbCDczrKEaUnh3gVeSWv9/OPV8DONINnT+/sC4rmJ7qPy5bi+BRU 8DPts0Gk4B8ZeKPhoWILX7VyuWbfalAIFiFFORfHdqhJu9rzyeeRToQDMLN1LL2h/cL4 n7MA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=PuJ537HF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r14-20020a17090b050e00b0025004bcf6casi35509pjz.4.2023.05.16.13.28.00; Tue, 16 May 2023 13:28:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=PuJ537HF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230469AbjEPUPK (ORCPT + 99 others); Tue, 16 May 2023 16:15:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231137AbjEPUO4 (ORCPT ); Tue, 16 May 2023 16:14:56 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ADEA97D9C for ; Tue, 16 May 2023 13:14:38 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5174E63D91 for ; Tue, 16 May 2023 20:14:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7FCBDC433A0; Tue, 16 May 2023 20:14:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684268076; bh=6CLuxrIav2439MrPgOxLsybmU0ZxykMENHio5PB5Xks=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PuJ537HFxfcwhdqwCP8FY0Iz+JnIIEcw+QdKeU4PnmNDYL/WVfrqMMCxzuIZ6eXCs 3f9dFRNu/A3vXHLgWDe5fvmcRFazgvPMJo+AD0Agor6XUqgoQaPRbLe+Gy3Mvodwvq yZWJh8hpJ2gWwW6Y/LeKSuaYs/6IsH6gxZFhKZnr6dp4c4qK3YEmwu9aymaHj/B9NX p1TIc26HTglrtf9u5RrYB3Fwv9sY0cYNgsigJyLYbqpNN6Wnyjkxo6MFKtzk3Ednsx DWOVIRLCVNHJesogc+ASjuUbKgnQW1B874rgEDwlKV8PWSdMWeLKtBBRwbtmC4Qm99 uhmZKCIs1NFeA== From: Arnd Bergmann To: Dan Williams , Vishal Verma , Dave Jiang , Ira Weiny , Jonathan Cameron Cc: Arnd Bergmann , Greg Kroah-Hartman , Hans de Goede , nvdimm@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] libnvdimm: mark 'security_show' static again Date: Tue, 16 May 2023 22:14:09 +0200 Message-Id: <20230516201415.556858-3-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230516201415.556858-1-arnd@kernel.org> References: <20230516201415.556858-1-arnd@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766083940587297767?= X-GMAIL-MSGID: =?utf-8?q?1766083940587297767?= From: Arnd Bergmann The security_show() function was made global and __weak at some point to allow overriding it. The override was removed later, but it remains global, which causes a warning about the missing declaration: drivers/nvdimm/dimm_devs.c:352:9: error: no previous prototype for 'security_show' This is also not an appropriate name for a global symbol in the kernel, so just make it static again. Fixes: 15a8348707ff ("libnvdimm: Introduce CONFIG_NVDIMM_SECURITY_TEST flag") Signed-off-by: Arnd Bergmann Reviewed-by: Dave Jiang --- drivers/nvdimm/dimm_devs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nvdimm/dimm_devs.c b/drivers/nvdimm/dimm_devs.c index 957f7c3d17ba..10c3cb6a574a 100644 --- a/drivers/nvdimm/dimm_devs.c +++ b/drivers/nvdimm/dimm_devs.c @@ -349,7 +349,7 @@ static ssize_t available_slots_show(struct device *dev, } static DEVICE_ATTR_RO(available_slots); -ssize_t security_show(struct device *dev, +static ssize_t security_show(struct device *dev, struct device_attribute *attr, char *buf) { struct nvdimm *nvdimm = to_nvdimm(dev);