[PATCH] m68knommu: fix FEC platform device registration when driver is modular

[PATCH] m68knommu: fix FEC platform device registration when driver is modular

[Greg Ungerer]

The FEC (Fast Ethernet Crontroller) module on many ColdFire parts can
be compiled into the kernel, or as a module. Therefore the platform device
support for it is required whenever the driver is enabled - not just when
built into the kernel. Use IS_ENABLED(CONFIG_FEC) instead of a conditional
check on only the driver being built into the kernel.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
 arch/m68k/coldfire/device.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/m68k/coldfire/device.c b/arch/m68k/coldfire/device.c
index 71ea4c0..a0fc0c1 100644
--- a/arch/m68k/coldfire/device.c
+++ b/arch/m68k/coldfire/device.c
@@ -89,7 +89,7 @@ static struct platform_device mcf_uart = {
 	.dev.platform_data	= mcf_uart_platform_data,
 };
 
-#ifdef CONFIG_FEC
+#if IS_ENABLED(CONFIG_FEC)
 
 #ifdef CONFIG_M5441x
 #define FEC_NAME	"enet-fec"
@@ -329,7 +329,7 @@ static struct platform_device mcf_qspi = {
 
 static struct platform_device *mcf_devices[] __initdata = {
 	&mcf_uart,
-#ifdef CONFIG_FEC
+#if IS_ENABLED(CONFIG_FEC)
 	&mcf_fec0,
 #ifdef MCFFEC_BASE1
 	&mcf_fec1,
-- 
1.9.1

Re: [PATCH] m68knommu: fix FEC platform device registration when driver is modular

[Geert Uytterhoeven]

On Mon, Jan 11, 2016 at 2:21 AM, Greg Ungerer <gerg@uclinux.org> wrote:
> The FEC (Fast Ethernet Crontroller) module on many ColdFire parts can
> be compiled into the kernel, or as a module. Therefore the platform device
> support for it is required whenever the driver is enabled - not just when
> built into the kernel. Use IS_ENABLED(CONFIG_FEC) instead of a conditional
> check on only the driver being built into the kernel.
>
> Signed-off-by: Greg Ungerer <gerg@uclinux.org>

Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] m68knommu: fix FEC platform device registration when driver is modular

[Greg Ungerer]

On 11/01/16 17:50, Geert Uytterhoeven wrote:
> On Mon, Jan 11, 2016 at 2:21 AM, Greg Ungerer <gerg@uclinux.org> wrote:
>> The FEC (Fast Ethernet Crontroller) module on many ColdFire parts can
>> be compiled into the kernel, or as a module. Therefore the platform device
>> support for it is required whenever the driver is enabled - not just when
>> built into the kernel. Use IS_ENABLED(CONFIG_FEC) instead of a conditional
>> check on only the driver being built into the kernel.
>>
>> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
>
> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

Thanks Geert!

Regards
Greg