From patchwork Mon Sep 4 10:00:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Pisa X-Patchwork-Id: 1829470 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=devicetree-owner@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4RfPhw6Kv1z1yh1 for ; Mon, 4 Sep 2023 20:17:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348602AbjIDKRx (ORCPT ); Mon, 4 Sep 2023 06:17:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232168AbjIDKRw (ORCPT ); Mon, 4 Sep 2023 06:17:52 -0400 X-Greylist: delayed 599 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Mon, 04 Sep 2023 03:17:44 PDT Received: from mx-8.mail.web4u.cz (smtp7.web4u.cz [81.91.87.87]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4C6CCD3; Mon, 4 Sep 2023 03:17:44 -0700 (PDT) Received: from mx-8.mail.web4u.cz (localhost [127.0.0.1]) by mx-8.mail.web4u.cz (Postfix) with ESMTP id E00411FF76C; Mon, 4 Sep 2023 12:00:03 +0200 (CEST) Received: from baree.pikron.com (unknown [78.102.109.231]) (Authenticated sender: ppisa@pikron.com) by mx-8.mail.web4u.cz (Postfix) with ESMTPA id C96701FF1C9; Mon, 4 Sep 2023 12:00:02 +0200 (CEST) From: Pavel Pisa To: linux-can@vger.kernel.org, devicetree@vger.kernel.org, Lizhi Hou , Rob Herring Cc: Pavel Pisa Subject: [PATCH] of: overlay: Fix of_overlay_fdt_apply prototype when !CONFIG_OF_OVERLAY Date: Mon, 4 Sep 2023 12:00:02 +0200 Message-Id: <20230904100002.7913-1-pisa@cmp.felk.cvut.cz> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-W4U-Auth: 9133a192d60015118c58877a0c2c4b7bfee0d0a3 X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_20,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE 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: devicetree@vger.kernel.org The of_overlay_fdt_apply has been changed but when CONFIG_OF_OVERLAY support is not configured then old stub prototype is declared by of.h header. Signed-off-by: Pavel Pisa Acked-by: Marc Kleine-Budde --- include/linux/of.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/of.h b/include/linux/of.h index ed679819c279..6a9ddf20e79a 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -1676,8 +1676,8 @@ int of_overlay_notifier_unregister(struct notifier_block *nb); #else -static inline int of_overlay_fdt_apply(void *overlay_fdt, u32 overlay_fdt_size, - int *ovcs_id) +static inline int of_overlay_fdt_apply(const void *overlay_fdt, u32 overlay_fdt_size, + int *ovcs_id, struct device_node *target_base) { return -ENOTSUPP; }