diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:32 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:32 -0400 |
commit | 1d850bd0b291efd1740b8d87ce025363436eb6dc (patch) | |
tree | e0bfb32a27b58074206ec02a455272054c899ca2 /arch/ppc | |
parent | 5d682e4407d8364c286650baafcccae54d4b7c89 (diff) |
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: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'arch/ppc')
-rw-r--r-- | arch/ppc/kernel/ppc_ksyms.c | 5 | ||||
-rw-r--r-- | arch/ppc/kernel/setup.c | 2 | ||||
-rw-r--r-- | arch/ppc/platforms/pplus.c | 35 | ||||
-rw-r--r-- | arch/ppc/platforms/prep_setup.c | 38 |
4 files changed, 0 insertions, 80 deletions
diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c index c35350250cf..2ba659f401b 100644 --- a/arch/ppc/kernel/ppc_ksyms.c +++ b/arch/ppc/kernel/ppc_ksyms.c | |||
@@ -12,7 +12,6 @@ | |||
12 | #include <linux/irq.h> | 12 | #include <linux/irq.h> |
13 | #include <linux/pci.h> | 13 | #include <linux/pci.h> |
14 | #include <linux/delay.h> | 14 | #include <linux/delay.h> |
15 | #include <linux/ide.h> | ||
16 | #include <linux/pm.h> | 15 | #include <linux/pm.h> |
17 | #include <linux/bitops.h> | 16 | #include <linux/bitops.h> |
18 | 17 | ||
@@ -124,10 +123,6 @@ EXPORT_SYMBOL(__ioremap); | |||
124 | EXPORT_SYMBOL(iounmap); | 123 | EXPORT_SYMBOL(iounmap); |
125 | EXPORT_SYMBOL(ioremap_bot); /* aka VMALLOC_END */ | 124 | EXPORT_SYMBOL(ioremap_bot); /* aka VMALLOC_END */ |
126 | 125 | ||
127 | #if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) | ||
128 | EXPORT_SYMBOL(ppc_ide_md); | ||
129 | #endif | ||
130 | |||
131 | #ifdef CONFIG_PCI | 126 | #ifdef CONFIG_PCI |
132 | EXPORT_SYMBOL(isa_io_base); | 127 | EXPORT_SYMBOL(isa_io_base); |
133 | EXPORT_SYMBOL(isa_mem_base); | 128 | EXPORT_SYMBOL(isa_mem_base); |
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c index 294055902f0..bfddfdee0b6 100644 --- a/arch/ppc/kernel/setup.c +++ b/arch/ppc/kernel/setup.c | |||
@@ -10,7 +10,6 @@ | |||
10 | #include <linux/reboot.h> | 10 | #include <linux/reboot.h> |
11 | #include <linux/delay.h> | 11 | #include <linux/delay.h> |
12 | #include <linux/initrd.h> | 12 | #include <linux/initrd.h> |
13 | #include <linux/ide.h> | ||
14 | #include <linux/screen_info.h> | 13 | #include <linux/screen_info.h> |
15 | #include <linux/bootmem.h> | 14 | #include <linux/bootmem.h> |
16 | #include <linux/seq_file.h> | 15 | #include <linux/seq_file.h> |
@@ -57,7 +56,6 @@ extern void ppc6xx_idle(void); | |||
57 | extern void power4_idle(void); | 56 | extern void power4_idle(void); |
58 | 57 | ||
59 | extern boot_infos_t *boot_infos; | 58 | extern boot_infos_t *boot_infos; |
60 | struct ide_machdep_calls ppc_ide_md; | ||
61 | 59 | ||
62 | /* Used with the BI_MEMSIZE bootinfo parameter to store the memory | 60 | /* Used with the BI_MEMSIZE bootinfo parameter to store the memory |
63 | size value reported by the boot loader. */ | 61 | size value reported by the boot loader. */ |
diff --git a/arch/ppc/platforms/pplus.c b/arch/ppc/platforms/pplus.c index 384cdfea70f..cbcac85c7a7 100644 --- a/arch/ppc/platforms/pplus.c +++ b/arch/ppc/platforms/pplus.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <linux/ioport.h> | 19 | #include <linux/ioport.h> |
20 | #include <linux/console.h> | 20 | #include <linux/console.h> |
21 | #include <linux/pci.h> | 21 | #include <linux/pci.h> |
22 | #include <linux/ide.h> | ||
23 | #include <linux/seq_file.h> | 22 | #include <linux/seq_file.h> |
24 | #include <linux/root_dev.h> | 23 | #include <linux/root_dev.h> |
25 | 24 | ||
@@ -668,35 +667,6 @@ static void __init pplus_init_IRQ(void) | |||
668 | ppc_md.progress("init_irq: exit", 0); | 667 | ppc_md.progress("init_irq: exit", 0); |
669 | } | 668 | } |
670 | 669 | ||
671 | #if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) | ||
672 | /* | ||
673 | * IDE stuff. | ||
674 | */ | ||
675 | static int pplus_ide_default_irq(unsigned long base) | ||
676 | { | ||
677 | switch (base) { | ||
678 | case 0x1f0: | ||
679 | return 14; | ||
680 | case 0x170: | ||
681 | return 15; | ||
682 | default: | ||
683 | return 0; | ||
684 | } | ||
685 | } | ||
686 | |||
687 | static unsigned long pplus_ide_default_io_base(int index) | ||
688 | { | ||
689 | switch (index) { | ||
690 | case 0: | ||
691 | return 0x1f0; | ||
692 | case 1: | ||
693 | return 0x170; | ||
694 | default: | ||
695 | return 0; | ||
696 | } | ||
697 | } | ||
698 | #endif | ||
699 | |||
700 | #ifdef CONFIG_SMP | 670 | #ifdef CONFIG_SMP |
701 | /* PowerPlus (MTX) support */ | 671 | /* PowerPlus (MTX) support */ |
702 | static int __init smp_pplus_probe(void) | 672 | static int __init smp_pplus_probe(void) |
@@ -862,11 +832,6 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5, | |||
862 | ppc_md.find_end_of_memory = pplus_find_end_of_memory; | 832 | ppc_md.find_end_of_memory = pplus_find_end_of_memory; |
863 | ppc_md.setup_io_mappings = pplus_map_io; | 833 | ppc_md.setup_io_mappings = pplus_map_io; |
864 | 834 | ||
865 | #if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) | ||
866 | ppc_ide_md.default_irq = pplus_ide_default_irq; | ||
867 | ppc_ide_md.default_io_base = pplus_ide_default_io_base; | ||
868 | #endif | ||
869 | |||
870 | #ifdef CONFIG_SERIAL_TEXT_DEBUG | 835 | #ifdef CONFIG_SERIAL_TEXT_DEBUG |
871 | ppc_md.progress = gen550_progress; | 836 | ppc_md.progress = gen550_progress; |
872 | #endif /* CONFIG_SERIAL_TEXT_DEBUG */ | 837 | #endif /* CONFIG_SERIAL_TEXT_DEBUG */ |
diff --git a/arch/ppc/platforms/prep_setup.c b/arch/ppc/platforms/prep_setup.c index 38449855d5f..465b658c927 100644 --- a/arch/ppc/platforms/prep_setup.c +++ b/arch/ppc/platforms/prep_setup.c | |||
@@ -33,7 +33,6 @@ | |||
33 | #include <linux/console.h> | 33 | #include <linux/console.h> |
34 | #include <linux/timex.h> | 34 | #include <linux/timex.h> |
35 | #include <linux/pci.h> | 35 | #include <linux/pci.h> |
36 | #include <linux/ide.h> | ||
37 | #include <linux/seq_file.h> | 36 | #include <linux/seq_file.h> |
38 | #include <linux/root_dev.h> | 37 | #include <linux/root_dev.h> |
39 | 38 | ||
@@ -894,38 +893,6 @@ prep_init_IRQ(void) | |||
894 | i8259_init(MPC10X_MAPA_PCI_INTACK_ADDR, 0); | 893 | i8259_init(MPC10X_MAPA_PCI_INTACK_ADDR, 0); |
895 | } | 894 | } |
896 | 895 | ||
897 | #if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) | ||
898 | /* | ||
899 | * IDE stuff. | ||
900 | */ | ||
901 | static int | ||
902 | prep_ide_default_irq(unsigned long base) | ||
903 | { | ||
904 | switch (base) { | ||
905 | case 0x1f0: return 13; | ||
906 | case 0x170: return 13; | ||
907 | case 0x1e8: return 11; | ||
908 | case 0x168: return 10; | ||
909 | case 0xfff0: return 14; /* MCP(N)750 ide0 */ | ||
910 | case 0xffe0: return 15; /* MCP(N)750 ide1 */ | ||
911 | default: return 0; | ||
912 | } | ||
913 | } | ||
914 | |||
915 | static unsigned long | ||
916 | prep_ide_default_io_base(int index) | ||
917 | { | ||
918 | switch (index) { | ||
919 | case 0: return 0x1f0; | ||
920 | case 1: return 0x170; | ||
921 | case 2: return 0x1e8; | ||
922 | case 3: return 0x168; | ||
923 | default: | ||
924 | return 0; | ||
925 | } | ||
926 | } | ||
927 | #endif | ||
928 | |||
929 | #ifdef CONFIG_SMP | 896 | #ifdef CONFIG_SMP |
930 | /* PReP (MTX) support */ | 897 | /* PReP (MTX) support */ |
931 | static int __init | 898 | static int __init |
@@ -1070,11 +1037,6 @@ prep_init(unsigned long r3, unsigned long r4, unsigned long r5, | |||
1070 | 1037 | ||
1071 | ppc_md.setup_io_mappings = prep_map_io; | 1038 | ppc_md.setup_io_mappings = prep_map_io; |
1072 | 1039 | ||
1073 | #if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) | ||
1074 | ppc_ide_md.default_irq = prep_ide_default_irq; | ||
1075 | ppc_ide_md.default_io_base = prep_ide_default_io_base; | ||
1076 | #endif | ||
1077 | |||
1078 | #ifdef CONFIG_SMP | 1040 | #ifdef CONFIG_SMP |
1079 | smp_ops = &prep_smp_ops; | 1041 | smp_ops = &prep_smp_ops; |
1080 | #endif /* CONFIG_SMP */ | 1042 | #endif /* CONFIG_SMP */ |