m68k: Remove unused mach_max_dma_address

This information is unused since the discontinuous memory support
has been introduced in 2007.

Fixes: 12d810c1b8c2 ("m68k: discontinuous memory support")
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Link: https://lore.kernel.org/r/20201009095621.833192-1-laurent@vivier.eu
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c
index bee9f240f35deef59c5bf54651e90cfce0d355ce..3f6f7380d93c7f2ce7a84e87b21b49716d9fae0b 100644 (file)
--- a/arch/m68k/amiga/config.c
+++ b/arch/m68k/amiga/config.c
@@ -383,14 +383,6 @@ void __init config_amiga(void)
        mach_init_IRQ        = amiga_init_IRQ;
        mach_get_model       = amiga_get_model;
        mach_get_hardware_list = amiga_get_hardware_list;
-
-       /*
-        * default MAX_DMA=0xffffffff on all machines. If we don't do so, the SCSI
-        * code will not be able to allocate any mem for transfers, unless we are
-        * dealing with a Z2 mem only system.                  /Jes
-        */
-       mach_max_dma_address = 0xffffffff;
-
        mach_reset           = amiga_reset;
 #if IS_ENABLED(CONFIG_INPUT_M68K_BEEP)
        mach_beep            = amiga_mksound;

diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c
index 762da5d7a415db7397494c346facb7e7218e1014..2ebe5b6d229b71993f1a35aab345ed11d83a7a74 100644 (file)
--- a/arch/m68k/apollo/config.c
+++ b/arch/m68k/apollo/config.c
@@ -150,7 +150,6 @@ void __init config_apollo(void)
 
        mach_sched_init=dn_sched_init; /* */
        mach_init_IRQ=dn_init_IRQ;
-       mach_max_dma_address = 0xffffffff;
        mach_hwclk           = dn_dummy_hwclk; /* */
        mach_reset           = dn_dummy_reset;  /* */
 #ifdef CONFIG_HEARTBEAT

diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c
index 7ec3161e8517d8c4f607adb01be9177127f79408..43b4e764a1acfc8ae5a80e777fdd704e2247d757 100644 (file)
--- a/arch/m68k/atari/config.c
+++ b/arch/m68k/atari/config.c
@@ -205,7 +205,6 @@ void __init config_atari(void)
        mach_get_model   = atari_get_model;
        mach_get_hardware_list = atari_get_hardware_list;
        mach_reset           = atari_reset;
-       mach_max_dma_address = 0xffffff;
 #if IS_ENABLED(CONFIG_INPUT_M68K_BEEP)
        mach_beep          = atari_mksound;
 #endif

diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c
index 50f4d01363dff9930da8acc7b973ac04e340cb44..8afaa73ec802f71b8b8ad96a3e4719a2cd074223 100644 (file)
--- a/arch/m68k/bvme6000/config.c
+++ b/arch/m68k/bvme6000/config.c
@@ -101,7 +101,6 @@ void __init config_bvme6000(void)
     bvme6000_set_vectors();
 #endif
 
-    mach_max_dma_address = 0xffffffff;
     mach_sched_init      = bvme6000_sched_init;
     mach_init_IRQ        = bvme6000_init_IRQ;
     mach_hwclk           = bvme6000_hwclk;

diff --git a/arch/m68k/hp300/config.c b/arch/m68k/hp300/config.c
index a161d44fd20bb5dc20c6d9efd4ffef3bdb98ce74..ce1eb3d3d55d2f72e5d22286794d76c22b7740d1 100644 (file)
--- a/arch/m68k/hp300/config.c
+++ b/arch/m68k/hp300/config.c
@@ -260,7 +260,6 @@ void __init config_hp300(void)
 #ifdef CONFIG_HEARTBEAT
        mach_heartbeat       = hp300_pulse;
 #endif
-       mach_max_dma_address = 0xffffffff;
 
        if (hp300_model >= HP_330 && hp300_model <= HP_433S &&
            hp300_model != HP_350) {

diff --git a/arch/m68k/include/asm/machdep.h b/arch/m68k/include/asm/machdep.h
index 49bd3266b4b1b79ad9581f0b40d454b25228ffcd..e564101790abc007dc108a1ffc3acee636bac271 100644 (file)
--- a/arch/m68k/include/asm/machdep.h
+++ b/arch/m68k/include/asm/machdep.h
@@ -27,7 +27,6 @@ extern void (*mach_halt)( void );
 extern void (*mach_power_off)( void );
 extern unsigned long (*mach_hd_init) (unsigned long, unsigned long);
 extern void (*mach_hd_setup)(char *, int *);
-extern long mach_max_dma_address;
 extern void (*mach_heartbeat) (int);
 extern void (*mach_l2_flush) (int);
 extern void (*mach_beep) (unsigned int, unsigned int);

diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c
index ab8aa7be260f36abc7436dcc6dbf92d905cf043f..ade96b1ad94678caa0884f8b615d8c71eea14465 100644 (file)
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -99,7 +99,6 @@ EXPORT_SYMBOL(mach_set_rtc_pll);
 void (*mach_reset)( void );
 void (*mach_halt)( void );
 void (*mach_power_off)( void );
-long mach_max_dma_address = 0x00ffffff; /* default set to the lower 16MB */
 #ifdef CONFIG_HEARTBEAT
 void (*mach_heartbeat) (int);
 EXPORT_SYMBOL(mach_heartbeat);

diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index 0ac53d87493c888132eaa6df5145018d97b5b170..eff442e932cf46f8c39eff314b149a6671e0f035 100644 (file)
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -141,7 +141,6 @@ void __init config_mac(void)
        mach_reset = mac_reset;
        mach_halt = mac_poweroff;
        mach_power_off = mac_poweroff;
-       mach_max_dma_address = 0xffffffff;
 #if IS_ENABLED(CONFIG_INPUT_M68K_BEEP)
        mach_beep = mac_mksound;
 #endif

diff --git a/arch/m68k/mvme147/config.c b/arch/m68k/mvme147/config.c
index 490700aa2212eadd8fef21425778cfbcd38f6ecd..ead0e51ecd42cd2a968b9b1b709d9d49c96eb249 100644 (file)
--- a/arch/m68k/mvme147/config.c
+++ b/arch/m68k/mvme147/config.c
@@ -80,7 +80,6 @@ void __init mvme147_init_IRQ(void)
 
 void __init config_mvme147(void)
 {
-       mach_max_dma_address    = 0x01000000;
        mach_sched_init         = mvme147_sched_init;
        mach_init_IRQ           = mvme147_init_IRQ;
        mach_hwclk              = mvme147_hwclk;

diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c
index 5b86d10e0f84e2abb9539d104a6692a62676f3e9..79896c331d559db2e3c51aa5bd336eed42fdc2a2 100644 (file)
--- a/arch/m68k/mvme16x/config.c
+++ b/arch/m68k/mvme16x/config.c
@@ -268,7 +268,6 @@ void __init config_mvme16x(void)
     char id[40];
     uint16_t brdno = be16_to_cpu(p->brdno);
 
-    mach_max_dma_address = 0xffffffff;
     mach_sched_init      = mvme16x_sched_init;
     mach_init_IRQ        = mvme16x_init_IRQ;
     mach_hwclk           = mvme16x_hwclk;

diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c
index 4627de3c0603577a4dc3d7c799f9d3a086a33e30..58566262127de508c3ad1efcd2cc77959bc14b96 100644 (file)
--- a/arch/m68k/q40/config.c
+++ b/arch/m68k/q40/config.c
@@ -185,11 +185,6 @@ void __init config_q40(void)
 
        /* disable a few things that SMSQ might have left enabled */
        q40_disable_irqs();
-
-       /* no DMA at all, but ide-scsi requires it.. make sure
-        * all physical RAM fits into the boundary - otherwise
-        * allocator may play costly and useless tricks */
-       mach_max_dma_address = 1024*1024*1024;
 }
 
 

diff --git a/arch/m68k/sun3x/config.c b/arch/m68k/sun3x/config.c
index d806dee71a9ca569dbe284cfd3164d24a878799d..37121a0f12531fefa0a89da95fdef78ee071b3ab 100644 (file)
--- a/arch/m68k/sun3x/config.c
+++ b/arch/m68k/sun3x/config.c
@@ -44,8 +44,6 @@ void __init config_sun3x(void)
 
        sun3x_prom_init();
 
-       mach_max_dma_address = 0xffffffff; /* we can DMA anywhere, whee */
-
        mach_sched_init      = sun3x_sched_init;
        mach_init_IRQ        = sun3_init_IRQ;