From nobody Sat Sep 27 20:21:57 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF9EDC32772 for ; Tue, 23 Aug 2022 09:58:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243030AbiHWJ6Z (ORCPT ); Tue, 23 Aug 2022 05:58:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243051AbiHWJxP (ORCPT ); Tue, 23 Aug 2022 05:53:15 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83FC77B28A; Tue, 23 Aug 2022 01:46:17 -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 ams.source.kernel.org (Postfix) with ESMTPS id 75153B81C35; Tue, 23 Aug 2022 08:45:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8AFAC433D6; Tue, 23 Aug 2022 08:45:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661244332; bh=noez/ZkmF/rf36ZF4kOxe89YB9P/7CZvBLY6FVVeh3I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h3aQzwIeyQFD9qRiu0GTB4LzxZtBX0UXxFviFEFSnY8L/nhs3Rpsvx+12xOEfQrSi wQwPf/Ai2YOM+S6igGioJG8O+XdnUiZyX9/Rziv+GNP8UKXIRZ+tUC5s67o7F6tQUf /4oXJq5GvT6pQRKhjTWICJ0aO0mdPKi4vzwRhewU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Randy Dunlap , Greg Ungerer , Geert Uytterhoeven , linux-m68k@lists.linux-m68k.org, uclinux-dev@uclinux.org, Angelo Dureghello Subject: [PATCH 5.15 052/244] m68k: coldfire/device.c: protect FLEXCAN blocks Date: Tue, 23 Aug 2022 10:23:31 +0200 Message-Id: <20220823080100.798237693@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080059.091088642@linuxfoundation.org> References: <20220823080059.091088642@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Randy Dunlap commit 3c2bf173501652fced1d058834e9c983d295b126 upstream. When CAN_FLEXCAN=3Dy and M5441x is not set/enabled, there are build errors in coldfire/device.c: ../arch/m68k/coldfire/device.c:595:26: error: 'MCFFLEXCAN_BASE0' undeclared= here (not in a function); did you mean 'MCFDMA_BASE0'? 595 | .start =3D MCFFLEXCAN_BASE0, ../arch/m68k/coldfire/device.c:596:43: error: 'MCFFLEXCAN_SIZE' undeclared = here (not in a function) 596 | .end =3D MCFFLEXCAN_BASE0 + MCFFLEXCAN_SIZE, ../arch/m68k/coldfire/device.c:600:26: error: 'MCF_IRQ_IFL0' undeclared her= e (not in a function); did you mean 'MCF_IRQ_I2C0'? 600 | .start =3D MCF_IRQ_IFL0, ../arch/m68k/coldfire/device.c:605:26: error: 'MCF_IRQ_BOFF0' undeclared he= re (not in a function); did you mean 'MCF_IRQ_I2C0'? 605 | .start =3D MCF_IRQ_BOFF0, ../arch/m68k/coldfire/device.c:610:26: error: 'MCF_IRQ_ERR0' undeclared her= e (not in a function); did you mean 'MCF_IRQ_I2C0'? 610 | .start =3D MCF_IRQ_ERR0, Protect the FLEXCAN code blocks by checking if MCFFLEXCAN_SIZE is defined. Fixes: 35a9f9363a89 ("m68k: m5441x: add flexcan support") Signed-off-by: Randy Dunlap Cc: Greg Ungerer Cc: Geert Uytterhoeven Cc: linux-m68k@lists.linux-m68k.org Cc: uclinux-dev@uclinux.org Cc: Angelo Dureghello Signed-off-by: Greg Ungerer Signed-off-by: Greg Kroah-Hartman --- arch/m68k/coldfire/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/m68k/coldfire/device.c b/arch/m68k/coldfire/device.c index 4218750414bb..7dab46728aed 100644 --- a/arch/m68k/coldfire/device.c +++ b/arch/m68k/coldfire/device.c @@ -581,7 +581,7 @@ static struct platform_device mcf_esdhc =3D { }; #endif /* MCFSDHC_BASE */ =20 -#if IS_ENABLED(CONFIG_CAN_FLEXCAN) +#ifdef MCFFLEXCAN_SIZE =20 #include =20 @@ -620,7 +620,7 @@ static struct platform_device mcf_flexcan0 =3D { .resource =3D mcf5441x_flexcan0_resource, .dev.platform_data =3D &mcf5441x_flexcan_info, }; -#endif /* IS_ENABLED(CONFIG_CAN_FLEXCAN) */ +#endif /* MCFFLEXCAN_SIZE */ =20 static struct platform_device *mcf_devices[] __initdata =3D { &mcf_uart, @@ -657,7 +657,7 @@ static struct platform_device *mcf_devices[] __initdata= =3D { #ifdef MCFSDHC_BASE &mcf_esdhc, #endif -#if IS_ENABLED(CONFIG_CAN_FLEXCAN) +#ifdef MCFFLEXCAN_SIZE &mcf_flexcan0, #endif }; --=20 2.37.2