From patchwork Fri Jan 24 09:27:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 232823 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable 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 AD126C35242 for ; Fri, 24 Jan 2020 11:41:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 84F5F2467B for ; Fri, 24 Jan 2020 11:41:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579866110; bh=NkK8E8I7Ljz9BaFANU6oBTZchsYZNsY2jgeUybzQZrA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xJDRs4++K/OrpqQuuK0DA1XtZXS+zvmCrAwT4KjqJ2hmbIEJtPiGxEe6fBOQ9ABuG e8n4CN+M2fmK4QxlWG3/utSR3tVnLSteiA/EO2e025Lpx1cpG5xxjDr/VKi/whJfp6 KZeRlIVPHjWPQVZtYII/F9+8hKTdWAzSQH8KKjds= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390395AbgAXLQk (ORCPT ); Fri, 24 Jan 2020 06:16:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:53510 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390185AbgAXLQk (ORCPT ); Fri, 24 Jan 2020 06:16:40 -0500 Received: from localhost (ip-213-127-102-57.ip.prioritytelecom.net [213.127.102.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8CE962077C; Fri, 24 Jan 2020 11:16:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579864600; bh=NkK8E8I7Ljz9BaFANU6oBTZchsYZNsY2jgeUybzQZrA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yUz9sduDSfP6YwscXNWwZGp4DDMRR9jdku0GoZGZG6szt4b6vIMqudFvcDP2bChTa 5Ob7OQsG150t+b9r8iKa88o5QPPCE+M6+tVbK+r9yW/H2B48H7QLN/eL13WQAlF3EC B4abaDIxhMRSiA6yiVQjjsej6oKfksuRGO6yAT9g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chris Packham , Frank Rowand , Rob Herring , Sasha Levin Subject: [PATCH 4.19 298/639] of: use correct function prototype for of_overlay_fdt_apply() Date: Fri, 24 Jan 2020 10:27:48 +0100 Message-Id: <20200124093124.248475233@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Chris Packham [ Upstream commit ecb0abc1d8528015957fbd034be8bfe760363b3b ] When CONFIG_OF_OVERLAY is not enabled the fallback stub for of_overlay_fdt_apply() does not match the prototype for the case when CONFIG_OF_OVERLAY is enabled. Update the stub to use the correct function prototype. Fixes: 39a751a4cb7e ("of: change overlay apply input data from unflattened to FDT") Signed-off-by: Chris Packham Reviewed-by: Frank Rowand Signed-off-by: Rob Herring Signed-off-by: Sasha Levin --- include/linux/of.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/linux/of.h b/include/linux/of.h index dac0201eacef7..d4f14b0302b63 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -1425,7 +1425,8 @@ int of_overlay_notifier_unregister(struct notifier_block *nb); #else -static inline int of_overlay_fdt_apply(void *overlay_fdt, int *ovcs_id) +static inline int of_overlay_fdt_apply(void *overlay_fdt, u32 overlay_fdt_size, + int *ovcs_id) { return -ENOTSUPP; }