Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b892806 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

cleanup after APUS removal 



After the APUS removal, some code can be removed.

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Acked-by: default avatarGeert 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b524b9ad

arch/m68k/amiga/chipram.c

+0 −2
Original line number Diff line number Diff line
@@ -32,12 +32,10 @@ void __init amiga_chip_init(void) 
    if (!AMIGAHW_PRESENT(CHIP_RAM))

	return;



#ifndef CONFIG_APUS_FAST_EXCEPT

    /*

     *  Remove the first 4 pages where PPC exception handlers will be located

     */

    amiga_chip_size -= 0x4000;

#endif

    chipram_res.end = amiga_chip_size-1;

    request_resource(&iomem_resource, &chipram_res);

drivers/ide/ide-probe.c

+3 −3
Original line number Diff line number Diff line
@@ -1049,7 +1049,7 @@ static int init_irq (ide_hwif_t *hwif) 
	 */

	if (!match || match->irq != hwif->irq) {

		int sa = 0;

#if defined(__mc68000__) || defined(CONFIG_APUS)

#if defined(__mc68000__)

		sa = IRQF_SHARED;

#endif /* __mc68000__ || CONFIG_APUS */
@@ -1072,7 +1072,7 @@ static int init_irq (ide_hwif_t *hwif) 
			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,

		hwif->io_ports[IDE_DATA_OFFSET],

		hwif->io_ports[IDE_DATA_OFFSET]+7,
@@ -1080,7 +1080,7 @@ static int init_irq (ide_hwif_t *hwif) 
#else

	printk("%s at 0x%08lx on irq %d", hwif->name,

		hwif->io_ports[IDE_DATA_OFFSET], hwif->irq);

#endif /* __mc68000__ && CONFIG_APUS */

#endif /* __mc68000__ */

	if (match)

		printk(" (%sed with %s)",

			hwif->sharing_irq ? "shar" : "serializ", match->name);

drivers/isdn/hisax/avm_pci.c

+0 −8
Original line number Diff line number Diff line
@@ -263,11 +263,7 @@ hdlc_empty_fifo(struct BCState *bcs, int count) 
		outl(idx, cs->hw.avm.cfg_reg + 4);

		while (cnt < count) {

#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));

#endif /* CONFIG_APUS */

#else

			*ptr++ = inl(cs->hw.avm.isac);

#endif /* __powerpc__ */
@@ -328,11 +324,7 @@ hdlc_fill_fifo(struct BCState *bcs) 
	if (cs->subtyp == AVM_FRITZ_PCI) {

		while (cnt<count) {

#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++);

#endif /* CONFIG_APUS */

#else

			outl(*ptr++, cs->hw.avm.isac);

#endif /* __powerpc__ */

drivers/scsi/a2091.c

+1 −2
Original line number Diff line number Diff line
@@ -46,8 +46,7 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in) 
    struct Scsi_Host *instance = cmd->device->host;



    /* don't allow DMA if the physical address is bad */

    if (addr & A2091_XFER_MASK ||

	(!dir_in && mm_end_of_chunk (addr, cmd->SCp.this_residual)))

    if (addr & A2091_XFER_MASK)

    {

	HDATA(instance)->dma_bounce_len = (cmd->SCp.this_residual + 511)

	    & ~0x1ff;

drivers/scsi/a3000.c

+1 −2
Original line number Diff line number Diff line
@@ -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

     * buffer

     */

    if (addr & A3000_XFER_MASK ||

	(!dir_in && mm_end_of_chunk (addr, cmd->SCp.this_residual)))

    if (addr & A3000_XFER_MASK)

    {

	HDATA(a3000_host)->dma_bounce_len = (cmd->SCp.this_residual + 511)

	    & ~0x1ff;