mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-09-21 20:22:13 +08:00
cleanup after APUS removal
After the APUS removal, some code can be removed. Signed-off-by: Adrian Bunk <bunk@kernel.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Cc: Karsten Keil <kkeil@suse.de> Cc: James Bottomley <James.Bottomley@steeleye.com> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
b524b9adb3
commit
7b892806b0
@ -32,12 +32,10 @@ void __init amiga_chip_init(void)
|
|||||||
if (!AMIGAHW_PRESENT(CHIP_RAM))
|
if (!AMIGAHW_PRESENT(CHIP_RAM))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
#ifndef CONFIG_APUS_FAST_EXCEPT
|
|
||||||
/*
|
/*
|
||||||
* Remove the first 4 pages where PPC exception handlers will be located
|
* Remove the first 4 pages where PPC exception handlers will be located
|
||||||
*/
|
*/
|
||||||
amiga_chip_size -= 0x4000;
|
amiga_chip_size -= 0x4000;
|
||||||
#endif
|
|
||||||
chipram_res.end = amiga_chip_size-1;
|
chipram_res.end = amiga_chip_size-1;
|
||||||
request_resource(&iomem_resource, &chipram_res);
|
request_resource(&iomem_resource, &chipram_res);
|
||||||
|
|
||||||
|
@ -1049,7 +1049,7 @@ static int init_irq (ide_hwif_t *hwif)
|
|||||||
*/
|
*/
|
||||||
if (!match || match->irq != hwif->irq) {
|
if (!match || match->irq != hwif->irq) {
|
||||||
int sa = 0;
|
int sa = 0;
|
||||||
#if defined(__mc68000__) || defined(CONFIG_APUS)
|
#if defined(__mc68000__)
|
||||||
sa = IRQF_SHARED;
|
sa = IRQF_SHARED;
|
||||||
#endif /* __mc68000__ || CONFIG_APUS */
|
#endif /* __mc68000__ || CONFIG_APUS */
|
||||||
|
|
||||||
@ -1072,7 +1072,7 @@ static int init_irq (ide_hwif_t *hwif)
|
|||||||
hwif->rqsize = 65536;
|
hwif->rqsize = 65536;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !defined(__mc68000__) && !defined(CONFIG_APUS)
|
#if !defined(__mc68000__)
|
||||||
printk("%s at 0x%03lx-0x%03lx,0x%03lx on irq %d", hwif->name,
|
printk("%s at 0x%03lx-0x%03lx,0x%03lx on irq %d", hwif->name,
|
||||||
hwif->io_ports[IDE_DATA_OFFSET],
|
hwif->io_ports[IDE_DATA_OFFSET],
|
||||||
hwif->io_ports[IDE_DATA_OFFSET]+7,
|
hwif->io_ports[IDE_DATA_OFFSET]+7,
|
||||||
@ -1080,7 +1080,7 @@ static int init_irq (ide_hwif_t *hwif)
|
|||||||
#else
|
#else
|
||||||
printk("%s at 0x%08lx on irq %d", hwif->name,
|
printk("%s at 0x%08lx on irq %d", hwif->name,
|
||||||
hwif->io_ports[IDE_DATA_OFFSET], hwif->irq);
|
hwif->io_ports[IDE_DATA_OFFSET], hwif->irq);
|
||||||
#endif /* __mc68000__ && CONFIG_APUS */
|
#endif /* __mc68000__ */
|
||||||
if (match)
|
if (match)
|
||||||
printk(" (%sed with %s)",
|
printk(" (%sed with %s)",
|
||||||
hwif->sharing_irq ? "shar" : "serializ", match->name);
|
hwif->sharing_irq ? "shar" : "serializ", match->name);
|
||||||
|
@ -263,11 +263,7 @@ hdlc_empty_fifo(struct BCState *bcs, int count)
|
|||||||
outl(idx, cs->hw.avm.cfg_reg + 4);
|
outl(idx, cs->hw.avm.cfg_reg + 4);
|
||||||
while (cnt < count) {
|
while (cnt < count) {
|
||||||
#ifdef __powerpc__
|
#ifdef __powerpc__
|
||||||
#ifdef CONFIG_APUS
|
|
||||||
*ptr++ = in_le32((unsigned *)(cs->hw.avm.isac +_IO_BASE));
|
|
||||||
#else
|
|
||||||
*ptr++ = in_be32((unsigned *)(cs->hw.avm.isac +_IO_BASE));
|
*ptr++ = in_be32((unsigned *)(cs->hw.avm.isac +_IO_BASE));
|
||||||
#endif /* CONFIG_APUS */
|
|
||||||
#else
|
#else
|
||||||
*ptr++ = inl(cs->hw.avm.isac);
|
*ptr++ = inl(cs->hw.avm.isac);
|
||||||
#endif /* __powerpc__ */
|
#endif /* __powerpc__ */
|
||||||
@ -328,11 +324,7 @@ hdlc_fill_fifo(struct BCState *bcs)
|
|||||||
if (cs->subtyp == AVM_FRITZ_PCI) {
|
if (cs->subtyp == AVM_FRITZ_PCI) {
|
||||||
while (cnt<count) {
|
while (cnt<count) {
|
||||||
#ifdef __powerpc__
|
#ifdef __powerpc__
|
||||||
#ifdef CONFIG_APUS
|
|
||||||
out_le32((unsigned *)(cs->hw.avm.isac +_IO_BASE), *ptr++);
|
|
||||||
#else
|
|
||||||
out_be32((unsigned *)(cs->hw.avm.isac +_IO_BASE), *ptr++);
|
out_be32((unsigned *)(cs->hw.avm.isac +_IO_BASE), *ptr++);
|
||||||
#endif /* CONFIG_APUS */
|
|
||||||
#else
|
#else
|
||||||
outl(*ptr++, cs->hw.avm.isac);
|
outl(*ptr++, cs->hw.avm.isac);
|
||||||
#endif /* __powerpc__ */
|
#endif /* __powerpc__ */
|
||||||
|
@ -46,8 +46,7 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
|
|||||||
struct Scsi_Host *instance = cmd->device->host;
|
struct Scsi_Host *instance = cmd->device->host;
|
||||||
|
|
||||||
/* don't allow DMA if the physical address is bad */
|
/* don't allow DMA if the physical address is bad */
|
||||||
if (addr & A2091_XFER_MASK ||
|
if (addr & A2091_XFER_MASK)
|
||||||
(!dir_in && mm_end_of_chunk (addr, cmd->SCp.this_residual)))
|
|
||||||
{
|
{
|
||||||
HDATA(instance)->dma_bounce_len = (cmd->SCp.this_residual + 511)
|
HDATA(instance)->dma_bounce_len = (cmd->SCp.this_residual + 511)
|
||||||
& ~0x1ff;
|
& ~0x1ff;
|
||||||
|
@ -54,8 +54,7 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
|
|||||||
* end of a physical memory chunk, then allocate a bounce
|
* end of a physical memory chunk, then allocate a bounce
|
||||||
* buffer
|
* buffer
|
||||||
*/
|
*/
|
||||||
if (addr & A3000_XFER_MASK ||
|
if (addr & A3000_XFER_MASK)
|
||||||
(!dir_in && mm_end_of_chunk (addr, cmd->SCp.this_residual)))
|
|
||||||
{
|
{
|
||||||
HDATA(a3000_host)->dma_bounce_len = (cmd->SCp.this_residual + 511)
|
HDATA(a3000_host)->dma_bounce_len = (cmd->SCp.this_residual + 511)
|
||||||
& ~0x1ff;
|
& ~0x1ff;
|
||||||
|
@ -54,8 +54,7 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
|
|||||||
static int scsi_alloc_out_of_range = 0;
|
static int scsi_alloc_out_of_range = 0;
|
||||||
|
|
||||||
/* use bounce buffer if the physical address is bad */
|
/* use bounce buffer if the physical address is bad */
|
||||||
if (addr & HDATA(cmd->device->host)->dma_xfer_mask ||
|
if (addr & HDATA(cmd->device->host)->dma_xfer_mask)
|
||||||
(!dir_in && mm_end_of_chunk (addr, cmd->SCp.this_residual)))
|
|
||||||
{
|
{
|
||||||
HDATA(cmd->device->host)->dma_bounce_len = (cmd->SCp.this_residual + 511)
|
HDATA(cmd->device->host)->dma_bounce_len = (cmd->SCp.this_residual + 511)
|
||||||
& ~0x1ff;
|
& ~0x1ff;
|
||||||
|
@ -84,7 +84,7 @@
|
|||||||
#ifdef CONFIG_MAC
|
#ifdef CONFIG_MAC
|
||||||
#include <asm/macints.h>
|
#include <asm/macints.h>
|
||||||
#endif
|
#endif
|
||||||
#if defined(__mc68000__) || defined(CONFIG_APUS)
|
#if defined(__mc68000__)
|
||||||
#include <asm/machdep.h>
|
#include <asm/machdep.h>
|
||||||
#include <asm/setup.h>
|
#include <asm/setup.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <linux/string.h>
|
#include <linux/string.h>
|
||||||
#if defined(__mc68000__) || defined(CONFIG_APUS)
|
#if defined(__mc68000__)
|
||||||
#include <asm/setup.h>
|
#include <asm/setup.h>
|
||||||
#endif
|
#endif
|
||||||
#include <linux/font.h>
|
#include <linux/font.h>
|
||||||
@ -120,7 +120,7 @@ const struct font_desc *get_default_font(int xres, int yres, u32 font_w,
|
|||||||
for(i=0; i<num_fonts; i++) {
|
for(i=0; i<num_fonts; i++) {
|
||||||
f = fonts[i];
|
f = fonts[i];
|
||||||
c = f->pref;
|
c = f->pref;
|
||||||
#if defined(__mc68000__) || defined(CONFIG_APUS)
|
#if defined(__mc68000__)
|
||||||
#ifdef CONFIG_FONT_PEARL_8x8
|
#ifdef CONFIG_FONT_PEARL_8x8
|
||||||
if (MACH_IS_AMIGA && f->idx == PEARL8x8_IDX)
|
if (MACH_IS_AMIGA && f->idx == PEARL8x8_IDX)
|
||||||
c = 100;
|
c = 100;
|
||||||
|
@ -107,8 +107,6 @@ extern void *empty_zero_page;
|
|||||||
/* 64-bit machines, beware! SRB. */
|
/* 64-bit machines, beware! SRB. */
|
||||||
#define SIZEOF_PTR_LOG2 2
|
#define SIZEOF_PTR_LOG2 2
|
||||||
|
|
||||||
#define mm_end_of_chunk(addr, len) 0
|
|
||||||
|
|
||||||
extern void kernel_set_cachemode(void *addr, unsigned long size, int cmode);
|
extern void kernel_set_cachemode(void *addr, unsigned long size, int cmode);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -14,7 +14,7 @@ config DMASOUND_ATARI
|
|||||||
|
|
||||||
config DMASOUND_PAULA
|
config DMASOUND_PAULA
|
||||||
tristate "Amiga DMA sound support"
|
tristate "Amiga DMA sound support"
|
||||||
depends on (AMIGA || APUS) && SOUND
|
depends on AMIGA && SOUND
|
||||||
select DMASOUND
|
select DMASOUND
|
||||||
help
|
help
|
||||||
If you want to use the internal audio of your Amiga in Linux, answer
|
If you want to use the internal audio of your Amiga in Linux, answer
|
||||||
|
@ -91,10 +91,6 @@ static irqreturn_t AmiInterrupt(int irq, void *dummy);
|
|||||||
* power LED are controlled by the same line.
|
* power LED are controlled by the same line.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef CONFIG_APUS
|
|
||||||
#define mach_heartbeat ppc_md.heartbeat
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static void (*saved_heartbeat)(int) = NULL;
|
static void (*saved_heartbeat)(int) = NULL;
|
||||||
|
|
||||||
static inline void disable_heartbeat(void)
|
static inline void disable_heartbeat(void)
|
||||||
|
Loading…
Reference in New Issue
Block a user