Commit 1d850bd0 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ppc: remove ppc_ide_md 



* Add special cases for pplus and prep to ide_default_{irq,io_base}()
  (+ FIXMEs about the need to use IDE platform host driver instead).

* Remove no longer needed ppc_ide_md and struct ide_machdep_calls.

* Then remove <linux/ide.h> include from:
  - arch/powerpc/kernel/setup_32.c
  - arch/ppc/kernel/ppc_ksyms.c
  - arch/ppc/kernel/setup.c
  - arch/ppc/platforms/pplus.c
  - arch/ppc/platforms/prep_setup.c

There should be no functional changes caused by this patch.

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 5d682e44

arch/powerpc/kernel/setup_32.c

+0 −8
Original line number Diff line number Diff line
@@ -10,9 +10,6 @@ 
#include <linux/reboot.h>

#include <linux/delay.h>

#include <linux/initrd.h>

#if defined(CONFIG_IDE) || defined(CONFIG_IDE_MODULE)

#include <linux/ide.h>

#endif

#include <linux/tty.h>

#include <linux/bootmem.h>

#include <linux/seq_file.h>
@@ -51,11 +48,6 @@ 


extern void bootx_init(unsigned long r4, unsigned long phys);



#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)

struct ide_machdep_calls ppc_ide_md;

EXPORT_SYMBOL(ppc_ide_md);

#endif



int boot_cpuid;

EXPORT_SYMBOL_GPL(boot_cpuid);

int boot_cpuid_phys;

arch/ppc/kernel/ppc_ksyms.c

+0 −5
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <linux/irq.h>

#include <linux/pci.h>

#include <linux/delay.h>

#include <linux/ide.h>

#include <linux/pm.h>

#include <linux/bitops.h>
@@ -124,10 +123,6 @@ EXPORT_SYMBOL(__ioremap); 
EXPORT_SYMBOL(iounmap);

EXPORT_SYMBOL(ioremap_bot);	/* aka VMALLOC_END */



#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)

EXPORT_SYMBOL(ppc_ide_md);

#endif



#ifdef CONFIG_PCI

EXPORT_SYMBOL(isa_io_base);

EXPORT_SYMBOL(isa_mem_base);

arch/ppc/kernel/setup.c

+0 −2
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/reboot.h>

#include <linux/delay.h>

#include <linux/initrd.h>

#include <linux/ide.h>

#include <linux/screen_info.h>

#include <linux/bootmem.h>

#include <linux/seq_file.h>
@@ -57,7 +56,6 @@ extern void ppc6xx_idle(void); 
extern void power4_idle(void);



extern boot_infos_t *boot_infos;

struct ide_machdep_calls ppc_ide_md;



/* Used with the BI_MEMSIZE bootinfo parameter to store the memory

   size value reported by the boot loader. */

arch/ppc/platforms/pplus.c

+0 −35
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/ioport.h>

#include <linux/console.h>

#include <linux/pci.h>

#include <linux/ide.h>

#include <linux/seq_file.h>

#include <linux/root_dev.h>
@@ -668,35 +667,6 @@ static void __init pplus_init_IRQ(void) 
		ppc_md.progress("init_irq: exit", 0);

}



#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)

/*

 * IDE stuff.

 */

static int pplus_ide_default_irq(unsigned long base)

{

	switch (base) {

	case 0x1f0:

		return 14;

	case 0x170:

		return 15;

	default:

		return 0;

	}

}



static unsigned long pplus_ide_default_io_base(int index)

{

	switch (index) {

	case 0:

		return 0x1f0;

	case 1:

		return 0x170;

	default:

		return 0;

	}

}

#endif



#ifdef CONFIG_SMP

/* PowerPlus (MTX) support */

static int __init smp_pplus_probe(void)
@@ -862,11 +832,6 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5, 
	ppc_md.find_end_of_memory = pplus_find_end_of_memory;

	ppc_md.setup_io_mappings = pplus_map_io;



#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)

	ppc_ide_md.default_irq = pplus_ide_default_irq;

	ppc_ide_md.default_io_base = pplus_ide_default_io_base;

#endif



#ifdef CONFIG_SERIAL_TEXT_DEBUG

	ppc_md.progress = gen550_progress;

#endif				/* CONFIG_SERIAL_TEXT_DEBUG */

arch/ppc/platforms/prep_setup.c

+0 −38
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <linux/console.h>

#include <linux/timex.h>

#include <linux/pci.h>

#include <linux/ide.h>

#include <linux/seq_file.h>

#include <linux/root_dev.h>
@@ -894,38 +893,6 @@ prep_init_IRQ(void) 
		i8259_init(MPC10X_MAPA_PCI_INTACK_ADDR, 0);

}



#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)

/*

 * IDE stuff.

 */

static int

prep_ide_default_irq(unsigned long base)

{

	switch (base) {

		case 0x1f0: return 13;

		case 0x170: return 13;

		case 0x1e8: return 11;

		case 0x168: return 10;

		case 0xfff0: return 14;		/* MCP(N)750 ide0 */

		case 0xffe0: return 15;		/* MCP(N)750 ide1 */

		default: return 0;

	}

}



static unsigned long

prep_ide_default_io_base(int index)

{

	switch (index) {

		case 0: return 0x1f0;

		case 1: return 0x170;

		case 2: return 0x1e8;

		case 3: return 0x168;

		default:

			return 0;

	}

}

#endif



#ifdef CONFIG_SMP

/* PReP (MTX) support */

static int __init
@@ -1070,11 +1037,6 @@ prep_init(unsigned long r3, unsigned long r4, unsigned long r5, 


	ppc_md.setup_io_mappings = prep_map_io;



#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)

	ppc_ide_md.default_irq = prep_ide_default_irq;

	ppc_ide_md.default_io_base = prep_ide_default_io_base;

#endif



#ifdef CONFIG_SMP

	smp_ops			 = &prep_smp_ops;

#endif /* CONFIG_SMP */

CRA Git | Maintained and supported by SUSTech CRA and CCSE