aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2014-11-12 00:12:09 -0500
committerChristoph Hellwig <hch@lst.de>2014-11-20 03:11:14 -0500
commit3ff228af84b57767645d81a89c166c777646ad61 (patch)
tree85b68500170df132eff06a9526409bfe488ddd58 /arch/m68k
parent16b29e75a78ae03250233468b68f7ae467d3dc7a (diff)
atari_scsi: Convert to platform device
Convert atari_scsi to platform device and eliminate scsi_register(). Validate __setup options later on so that module options are checked as well. Remove the comment about the scsi mid-layer disabling the host irq as it is no longer true (AFAICT). Also remove the obsolete slow interrupt stuff (IRQ_TYPE_SLOW == 0 anyway). Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Reviewed-by: Hannes Reinecke <hare@suse.de> Tested-by: Michael Schmitz <schmitzmic@gmail.com> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/atari/config.c27
1 files changed, 27 insertions, 0 deletions
diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c
index 01a62161b08a..192b00f098f4 100644
--- a/arch/m68k/atari/config.c
+++ b/arch/m68k/atari/config.c
@@ -858,6 +858,24 @@ static struct platform_device *atari_netusbee_devices[] __initdata = {
858}; 858};
859#endif /* CONFIG_ATARI_ETHERNEC */ 859#endif /* CONFIG_ATARI_ETHERNEC */
860 860
861#ifdef CONFIG_ATARI_SCSI
862static const struct resource atari_scsi_st_rsrc[] __initconst = {
863 {
864 .flags = IORESOURCE_IRQ,
865 .start = IRQ_MFP_FSCSI,
866 .end = IRQ_MFP_FSCSI,
867 },
868};
869
870static const struct resource atari_scsi_tt_rsrc[] __initconst = {
871 {
872 .flags = IORESOURCE_IRQ,
873 .start = IRQ_TT_MFP_SCSI,
874 .end = IRQ_TT_MFP_SCSI,
875 },
876};
877#endif
878
861int __init atari_platform_init(void) 879int __init atari_platform_init(void)
862{ 880{
863 int rv = 0; 881 int rv = 0;
@@ -892,6 +910,15 @@ int __init atari_platform_init(void)
892 } 910 }
893#endif 911#endif
894 912
913#ifdef CONFIG_ATARI_SCSI
914 if (ATARIHW_PRESENT(ST_SCSI))
915 platform_device_register_simple("atari_scsi", -1,
916 atari_scsi_st_rsrc, ARRAY_SIZE(atari_scsi_st_rsrc));
917 else if (ATARIHW_PRESENT(TT_SCSI))
918 platform_device_register_simple("atari_scsi", -1,
919 atari_scsi_tt_rsrc, ARRAY_SIZE(atari_scsi_tt_rsrc));
920#endif
921
895 return rv; 922 return rv;
896} 923}
897 924