From patchwork Mon Dec 11 05:49:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 176478 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6850166vqy; Sun, 10 Dec 2023 21:51:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IGMlPPKnAsxG6r/pjgUMGq/gCeWQgfPP3VDeSQ/h8Ay3CnuPPFCRZVU0HeudHn4ir3EbYWy X-Received: by 2002:a05:6808:3c96:b0:3b8:b063:6bb6 with SMTP id gs22-20020a0568083c9600b003b8b0636bb6mr7465856oib.101.1702273877389; Sun, 10 Dec 2023 21:51:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702273877; cv=none; d=google.com; s=arc-20160816; b=mnGl00Fquj6wMeu8qw5N3+xs0a4QBJV4Ds6v6x9tyypn8BWh1YSJrqChRSW4+KlDtq aRo0QSnfHBbGK6rLeaSbXS0esICm55FP0unPY8YNXswR6kUtemNgmVPBj2jTWMfyIMcV ZhZErJkMmWx6bMeYPi7gEmsyDztnx6EeTcdcyS62poZ4NrwqUd3XEXqZlk/RmYIN6TVt /1wdIoCdzmnnsdSWx+3OCxAhXEmKdDHbZtNEmVo90ZlcnHLJAZBUXkLFYPRchT8Ju+C4 6NRerLBmIhN+cCGxbzjWKTCNzGvf3PL2bgApIxjxBdb0Er9rrNPnviTRyhlh1Ky2MC7K jYlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=5ownzIkARz43eQTloQkKelbMKKK9J+c14Q+Xkg/VpWU=; fh=qegMGk4wMJ232KPyChyHpCnoDW8x8z/A6PZiKlCDdS4=; b=CPPjJlmCGqhFqDVu55RcpSJIyl7G343mgmeRFLO9aK5E9S7yzJ+g4c8hvBKwb6BFXG xQ/Jp5Awj3mXsqgNc8ZTggYxAblP6IrKg6b9dOTJgD9CoFl0X8rqH4yVjMoCx5Uyv/Xn Wi9Tu2pkBltf9Xn5Lnj1fdu8uiPSvKaI6IuHE00qIYaNFBUApIOlVIfsXACbl7dS6RSi 8C9bxyxj617Hz1eZTbZsZwsY/Tl4r+3fjoz+DnSruPCWnjWmOHxwGgL26yHeTbycfTql ro+qryFXsYkwPY5yhGqSRK4RJfT7n+6Qfr5SuGyxYDJuAoidmnoXHv1tEpzMiXfwRQSm DJPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=g1QYRRL0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id z4-20020a056a00240400b006cbb7e5e06fsi5562298pfh.125.2023.12.10.21.51.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 21:51:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=g1QYRRL0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 6CC7B8051638; Sun, 10 Dec 2023 21:50:46 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233555AbjLKFua (ORCPT + 99 others); Mon, 11 Dec 2023 00:50:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233420AbjLKFuB (ORCPT ); Mon, 11 Dec 2023 00:50:01 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26804213E; Sun, 10 Dec 2023 21:49:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1702273758; bh=5ownzIkARz43eQTloQkKelbMKKK9J+c14Q+Xkg/VpWU=; h=Date:From:To:Cc:Subject:From; b=g1QYRRL0JgzIR/pbzVUeOs0X3Oy8te73acyAmxtMQiUrZtQLpDlFBSkvl0pC0K/uz h/a0AVTGZwQ+RTMd4lFEHpyxrOU3dPIlCgTfIQYP5tZNLNc+bwjmAvYP3QDJG6UorT h5XnUabVn0trae5u3qQpq+3E6IcBF0799Z+ZZAOnUory6qqS79ZMOtjGMTRRuN6gUl JPF8tCcCh+2DycfYsxYbqFoV4zZMMo9MtPmacJ/rUXK7eeLwDg4ZpiMnUl7f/xOF3k 9vAyQGYJx0WGLKgWfJNHEIp0AZ+pS/4K+I4NA/bGu5X5GjB6ir/cbuywybHKnhBxbE fQu2W1xABUpFg== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SpW5p1Rx6z4xGR; Mon, 11 Dec 2023 16:49:18 +1100 (AEDT) Date: Mon, 11 Dec 2023 16:49:16 +1100 From: Stephen Rothwell To: Srinivas Kandagatla Cc: Miquel Raynal , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the nvmem tree Message-ID: <20231211164916.6f0d2357@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Sun, 10 Dec 2023 21:50:46 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784963532976575852 X-GMAIL-MSGID: 1784963532976575852 Hi all, After merging the nvmem tree, today's linux-next build (i386 defconfig) failed like this: /home/sfr/next/next/drivers/nvmem/core.c: In function 'nvmem_cell_put': /home/sfr/next/next/drivers/nvmem/core.c:1603:9: error: implicit declaration of function 'nvmem_layout_module_put' [-Werror=implicit-function-declaration] 1603 | nvmem_layout_module_put(nvmem); | ^~~~~~~~~~~~~~~~~~~~~~~ Caused by commit ed7778e43271 ("nvmem: core: Rework layouts to become regular devices") I have applied the following patch for today. From: Stephen Rothwell Date: Mon, 11 Dec 2023 16:34:34 +1100 Subject: [PATCH] fix up for "nvmem: core: Rework layouts to become regular devices" Signed-off-by: Stephen Rothwell --- drivers/nvmem/core.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 9fc452e8ada8..784b61eb4d8e 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -1491,6 +1491,11 @@ struct nvmem_cell *of_nvmem_cell_get(struct device_node *np, const char *id) return cell; } EXPORT_SYMBOL_GPL(of_nvmem_cell_get); + +#else /* IS_ENABLED(CONFIG_OF) */ + +static inline void nvmem_layout_module_put(struct nvmem_device *nvmem) { } + #endif /**