Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

m68k/atari, m68k/sun3: Fix SCSI platform device registration when driver is modular

Browse source 
Fixes: 3ff228af84 ("atari_scsi: Convert to platform device")
Fixes: 0d31f87591 ("sun3_scsi: Convert to platform device")
Reported-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Finn Thain 2015-12-18 12:44:28 +11:00 committed by Geert Uytterhoeven
parent ea8d65ad69
commit 2d522618c8
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/m68k/atari/config.c
View file

@ -858,7 +858,7 @@ static struct platform_device *atari_netusbee_devices[] __initdata = {
}; };
#endif /* CONFIG_ATARI_ETHERNEC */ #endif /* CONFIG_ATARI_ETHERNEC */
#ifdef CONFIG_ATARI_SCSI #if IS_ENABLED(CONFIG_ATARI_SCSI)
static const struct resource atari_scsi_st_rsrc[] __initconst = { static const struct resource atari_scsi_st_rsrc[] __initconst = {
{ {
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
@ -910,7 +910,7 @@ int __init atari_platform_init(void)
} }
#endif #endif
#ifdef CONFIG_ATARI_SCSI #if IS_ENABLED(CONFIG_ATARI_SCSI)
if (ATARIHW_PRESENT(ST_SCSI)) if (ATARIHW_PRESENT(ST_SCSI))
platform_device_register_simple("atari_scsi", -1, platform_device_register_simple("atari_scsi", -1,
atari_scsi_st_rsrc, ARRAY_SIZE(atari_scsi_st_rsrc)); atari_scsi_st_rsrc, ARRAY_SIZE(atari_scsi_st_rsrc));

2
arch/m68k/sun3/config.c
View file

@ -171,7 +171,7 @@ static void __init sun3_sched_init(irq_handler_t timer_routine)
intersil_clear(); intersil_clear();
} }
#ifdef CONFIG_SUN3_SCSI #if IS_ENABLED(CONFIG_SUN3_SCSI)
static const struct resource sun3_scsi_vme_rsrc[] __initconst = { static const struct resource sun3_scsi_vme_rsrc[] __initconst = {
{ {