diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-21 17:06:37 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-03 18:57:13 -0500 |
commit | b881bc469bdbdcca60e75047885509eb9886d3a2 (patch) | |
tree | 5eb755591b667df0f04d7355544de613143458a7 | |
parent | f8d6c8d98d9ea7afef1e0d93d756a2dca879d1ea (diff) |
ARCH: drivers remove __dev* attributes.
This fixes up all of the smaller arches that had __dev* markings for
their platform-specific drivers.
CONFIG_HOTPLUG is going away as an option. As a result, the __dev*
markings need to be removed.
This change removes the use of __devinit, __devexit_p, __devinitdata,
__devinitconst, and __devexit from these drivers.
Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.
Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Chen Liqin <liqin.chen@sunplusct.com>
Cc: Lennox Wu <lennox.wu@gmail.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Cc: Bob Liu <lliubbo@gmail.com>
Cc: Srinivas Kandagatla <srinivas.kandagatla@st.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Myron Stowe <myron.stowe@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Thierry Reding <thierry.reding@avionic-design.de>
Cc: Greg Ungerer <gerg@uclinux.org>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
Cc: Mark Salter <msalter@redhat.com>
Cc: Yong Zhang <yong.zhang0@gmail.com>
Cc: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Cc: Jan Glauber <jang@linux.vnet.ibm.com>
Cc: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
27 files changed, 74 insertions, 90 deletions
diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index c76c7241125b..f7073c7b1ca9 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c | |||
@@ -1221,7 +1221,7 @@ static struct of_device_id armpmu_of_device_ids[] = { | |||
1221 | {}, | 1221 | {}, |
1222 | }; | 1222 | }; |
1223 | 1223 | ||
1224 | static int __devinit armpmu_device_probe(struct platform_device *pdev) | 1224 | static int armpmu_device_probe(struct platform_device *pdev) |
1225 | { | 1225 | { |
1226 | if (!cpu_pmu) | 1226 | if (!cpu_pmu) |
1227 | return -ENODEV; | 1227 | return -ENODEV; |
diff --git a/arch/avr32/lib/delay.c b/arch/avr32/lib/delay.c index 9aa8800830f3..c2f4a07dcda1 100644 --- a/arch/avr32/lib/delay.c +++ b/arch/avr32/lib/delay.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <asm/processor.h> | 20 | #include <asm/processor.h> |
21 | #include <asm/sysreg.h> | 21 | #include <asm/sysreg.h> |
22 | 22 | ||
23 | int __devinit read_current_timer(unsigned long *timer_value) | 23 | int read_current_timer(unsigned long *timer_value) |
24 | { | 24 | { |
25 | *timer_value = sysreg_read(COUNT); | 25 | *timer_value = sysreg_read(COUNT); |
26 | return 0; | 26 | return 0; |
diff --git a/arch/blackfin/mach-common/dpmc.c b/arch/blackfin/mach-common/dpmc.c index 978bb400be06..724a8c5f5578 100644 --- a/arch/blackfin/mach-common/dpmc.c +++ b/arch/blackfin/mach-common/dpmc.c | |||
@@ -129,7 +129,7 @@ static struct notifier_block vreg_cpufreq_notifier_block = { | |||
129 | * bfin_dpmc_probe - | 129 | * bfin_dpmc_probe - |
130 | * | 130 | * |
131 | */ | 131 | */ |
132 | static int __devinit bfin_dpmc_probe(struct platform_device *pdev) | 132 | static int bfin_dpmc_probe(struct platform_device *pdev) |
133 | { | 133 | { |
134 | if (pdev->dev.platform_data) | 134 | if (pdev->dev.platform_data) |
135 | pdata = pdev->dev.platform_data; | 135 | pdata = pdev->dev.platform_data; |
@@ -143,7 +143,7 @@ static int __devinit bfin_dpmc_probe(struct platform_device *pdev) | |||
143 | /** | 143 | /** |
144 | * bfin_dpmc_remove - | 144 | * bfin_dpmc_remove - |
145 | */ | 145 | */ |
146 | static int __devexit bfin_dpmc_remove(struct platform_device *pdev) | 146 | static int bfin_dpmc_remove(struct platform_device *pdev) |
147 | { | 147 | { |
148 | pdata = NULL; | 148 | pdata = NULL; |
149 | return cpufreq_unregister_notifier(&vreg_cpufreq_notifier_block, | 149 | return cpufreq_unregister_notifier(&vreg_cpufreq_notifier_block, |
@@ -152,7 +152,7 @@ static int __devexit bfin_dpmc_remove(struct platform_device *pdev) | |||
152 | 152 | ||
153 | struct platform_driver bfin_dpmc_device_driver = { | 153 | struct platform_driver bfin_dpmc_device_driver = { |
154 | .probe = bfin_dpmc_probe, | 154 | .probe = bfin_dpmc_probe, |
155 | .remove = __devexit_p(bfin_dpmc_remove), | 155 | .remove = bfin_dpmc_remove, |
156 | .driver = { | 156 | .driver = { |
157 | .name = DRIVER_NAME, | 157 | .name = DRIVER_NAME, |
158 | } | 158 | } |
diff --git a/arch/cris/arch-v32/drivers/pci/bios.c b/arch/cris/arch-v32/drivers/pci/bios.c index e3dfc72d0cfd..64a5fb93767d 100644 --- a/arch/cris/arch-v32/drivers/pci/bios.c +++ b/arch/cris/arch-v32/drivers/pci/bios.c | |||
@@ -2,7 +2,7 @@ | |||
2 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
3 | #include <arch/hwregs/intr_vect.h> | 3 | #include <arch/hwregs/intr_vect.h> |
4 | 4 | ||
5 | void __devinit pcibios_fixup_bus(struct pci_bus *b) | 5 | void pcibios_fixup_bus(struct pci_bus *b) |
6 | { | 6 | { |
7 | } | 7 | } |
8 | 8 | ||
diff --git a/arch/cris/arch-v32/kernel/smp.c b/arch/cris/arch-v32/kernel/smp.c index ebe2cb30bd11..04a16edd5401 100644 --- a/arch/cris/arch-v32/kernel/smp.c +++ b/arch/cris/arch-v32/kernel/smp.c | |||
@@ -84,7 +84,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) | |||
84 | cpumask_set_cpu(i, &phys_cpu_present_map); | 84 | cpumask_set_cpu(i, &phys_cpu_present_map); |
85 | } | 85 | } |
86 | 86 | ||
87 | void __devinit smp_prepare_boot_cpu(void) | 87 | void smp_prepare_boot_cpu(void) |
88 | { | 88 | { |
89 | /* PGD pointer has moved after per_cpu initialization so | 89 | /* PGD pointer has moved after per_cpu initialization so |
90 | * update the MMU. | 90 | * update the MMU. |
diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c index 3cb3392f799e..a5136474c6fd 100644 --- a/arch/frv/kernel/setup.c +++ b/arch/frv/kernel/setup.c | |||
@@ -852,7 +852,7 @@ void __init setup_arch(char **cmdline_p) | |||
852 | /* | 852 | /* |
853 | * | 853 | * |
854 | */ | 854 | */ |
855 | static int __devinit setup_arch_serial(void) | 855 | static int setup_arch_serial(void) |
856 | { | 856 | { |
857 | /* register those serial ports that are available */ | 857 | /* register those serial ports that are available */ |
858 | #ifndef CONFIG_GDBSTUB_UART0 | 858 | #ifndef CONFIG_GDBSTUB_UART0 |
diff --git a/arch/frv/mb93090-mb00/pci-vdk.c b/arch/frv/mb93090-mb00/pci-vdk.c index 71e9bcf58105..d186b254ce99 100644 --- a/arch/frv/mb93090-mb00/pci-vdk.c +++ b/arch/frv/mb93090-mb00/pci-vdk.c | |||
@@ -268,7 +268,7 @@ static void __init pci_fixup_umc_ide(struct pci_dev *d) | |||
268 | d->resource[i].flags |= PCI_BASE_ADDRESS_SPACE_IO; | 268 | d->resource[i].flags |= PCI_BASE_ADDRESS_SPACE_IO; |
269 | } | 269 | } |
270 | 270 | ||
271 | static void __devinit pci_fixup_ide_bases(struct pci_dev *d) | 271 | static void pci_fixup_ide_bases(struct pci_dev *d) |
272 | { | 272 | { |
273 | int i; | 273 | int i; |
274 | 274 | ||
@@ -287,7 +287,7 @@ static void __devinit pci_fixup_ide_bases(struct pci_dev *d) | |||
287 | } | 287 | } |
288 | } | 288 | } |
289 | 289 | ||
290 | static void __devinit pci_fixup_ide_trash(struct pci_dev *d) | 290 | static void pci_fixup_ide_trash(struct pci_dev *d) |
291 | { | 291 | { |
292 | int i; | 292 | int i; |
293 | 293 | ||
@@ -300,7 +300,7 @@ static void __devinit pci_fixup_ide_trash(struct pci_dev *d) | |||
300 | d->resource[i].start = d->resource[i].end = d->resource[i].flags = 0; | 300 | d->resource[i].start = d->resource[i].end = d->resource[i].flags = 0; |
301 | } | 301 | } |
302 | 302 | ||
303 | static void __devinit pci_fixup_latency(struct pci_dev *d) | 303 | static void pci_fixup_latency(struct pci_dev *d) |
304 | { | 304 | { |
305 | /* | 305 | /* |
306 | * SiS 5597 and 5598 chipsets require latency timer set to | 306 | * SiS 5597 and 5598 chipsets require latency timer set to |
diff --git a/arch/m32r/kernel/smpboot.c b/arch/m32r/kernel/smpboot.c index a2cfc0abb05c..13168a769f8f 100644 --- a/arch/m32r/kernel/smpboot.c +++ b/arch/m32r/kernel/smpboot.c | |||
@@ -127,7 +127,7 @@ static void unmap_cpu_to_physid(int, int); | |||
127 | /*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/ | 127 | /*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/ |
128 | /* Boot up APs Routines : BSP */ | 128 | /* Boot up APs Routines : BSP */ |
129 | /*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/ | 129 | /*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/ |
130 | void __devinit smp_prepare_boot_cpu(void) | 130 | void smp_prepare_boot_cpu(void) |
131 | { | 131 | { |
132 | bsp_phys_id = hard_smp_processor_id(); | 132 | bsp_phys_id = hard_smp_processor_id(); |
133 | physid_set(bsp_phys_id, phys_cpu_present_map); | 133 | physid_set(bsp_phys_id, phys_cpu_present_map); |
diff --git a/arch/m68k/emu/nfeth.c b/arch/m68k/emu/nfeth.c index a985a7e87d45..695cd737a42e 100644 --- a/arch/m68k/emu/nfeth.c +++ b/arch/m68k/emu/nfeth.c | |||
@@ -39,7 +39,7 @@ enum { | |||
39 | #define MAX_UNIT 8 | 39 | #define MAX_UNIT 8 |
40 | 40 | ||
41 | /* These identify the driver base version and may not be removed. */ | 41 | /* These identify the driver base version and may not be removed. */ |
42 | static const char version[] __devinitconst = | 42 | static const char version[] = |
43 | KERN_INFO KBUILD_MODNAME ".c:v" DRV_VERSION " " DRV_RELDATE | 43 | KERN_INFO KBUILD_MODNAME ".c:v" DRV_VERSION " " DRV_RELDATE |
44 | " S.Opichal, M.Jurik, P.Stehlik\n" | 44 | " S.Opichal, M.Jurik, P.Stehlik\n" |
45 | KERN_INFO " http://aranym.org/\n"; | 45 | KERN_INFO " http://aranym.org/\n"; |
diff --git a/arch/m68k/include/asm/parport.h b/arch/m68k/include/asm/parport.h index 646b1872f73b..5ea75e6a7399 100644 --- a/arch/m68k/include/asm/parport.h +++ b/arch/m68k/include/asm/parport.h | |||
@@ -15,8 +15,8 @@ | |||
15 | #define outsl(port,buf,len) isa_outsb(port,buf,(len)<<2) | 15 | #define outsl(port,buf,len) isa_outsb(port,buf,(len)<<2) |
16 | 16 | ||
17 | /* no dma, or IRQ autoprobing */ | 17 | /* no dma, or IRQ autoprobing */ |
18 | static int __devinit parport_pc_find_isa_ports (int autoirq, int autodma); | 18 | static int parport_pc_find_isa_ports (int autoirq, int autodma); |
19 | static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma) | 19 | static int parport_pc_find_nonpci_ports (int autoirq, int autodma) |
20 | { | 20 | { |
21 | if (! (MACH_IS_Q40)) | 21 | if (! (MACH_IS_Q40)) |
22 | return 0; /* count=0 */ | 22 | return 0; /* count=0 */ |
diff --git a/arch/m68k/kernel/pcibios.c b/arch/m68k/kernel/pcibios.c index 73fa0b56a06c..931a31ff59dd 100644 --- a/arch/m68k/kernel/pcibios.c +++ b/arch/m68k/kernel/pcibios.c | |||
@@ -87,7 +87,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) | |||
87 | return 0; | 87 | return 0; |
88 | } | 88 | } |
89 | 89 | ||
90 | void __devinit pcibios_fixup_bus(struct pci_bus *bus) | 90 | void pcibios_fixup_bus(struct pci_bus *bus) |
91 | { | 91 | { |
92 | struct pci_dev *dev; | 92 | struct pci_dev *dev; |
93 | 93 | ||
@@ -97,7 +97,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus) | |||
97 | } | 97 | } |
98 | } | 98 | } |
99 | 99 | ||
100 | char __devinit *pcibios_setup(char *str) | 100 | char *pcibios_setup(char *str) |
101 | { | 101 | { |
102 | return str; | 102 | return str; |
103 | } | 103 | } |
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c index a1c5b996d66d..2a20f1ff4c59 100644 --- a/arch/microblaze/pci/pci-common.c +++ b/arch/microblaze/pci/pci-common.c | |||
@@ -655,9 +655,8 @@ void pci_resource_to_user(const struct pci_dev *dev, int bar, | |||
655 | * - Some 32 bits platforms such as 4xx can have physical space larger than | 655 | * - Some 32 bits platforms such as 4xx can have physical space larger than |
656 | * 32 bits so we need to use 64 bits values for the parsing | 656 | * 32 bits so we need to use 64 bits values for the parsing |
657 | */ | 657 | */ |
658 | void __devinit pci_process_bridge_OF_ranges(struct pci_controller *hose, | 658 | void pci_process_bridge_OF_ranges(struct pci_controller *hose, |
659 | struct device_node *dev, | 659 | struct device_node *dev, int primary) |
660 | int primary) | ||
661 | { | 660 | { |
662 | const u32 *ranges; | 661 | const u32 *ranges; |
663 | int rlen; | 662 | int rlen; |
@@ -830,7 +829,7 @@ int pci_proc_domain(struct pci_bus *bus) | |||
830 | /* This header fixup will do the resource fixup for all devices as they are | 829 | /* This header fixup will do the resource fixup for all devices as they are |
831 | * probed, but not for bridge ranges | 830 | * probed, but not for bridge ranges |
832 | */ | 831 | */ |
833 | static void __devinit pcibios_fixup_resources(struct pci_dev *dev) | 832 | static void pcibios_fixup_resources(struct pci_dev *dev) |
834 | { | 833 | { |
835 | struct pci_controller *hose = pci_bus_to_host(dev->bus); | 834 | struct pci_controller *hose = pci_bus_to_host(dev->bus); |
836 | int i; | 835 | int i; |
@@ -871,8 +870,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pcibios_fixup_resources); | |||
871 | * things go more smoothly when it gets it right. It should covers cases such | 870 | * things go more smoothly when it gets it right. It should covers cases such |
872 | * as Apple "closed" bridge resources and bare-metal pSeries unassigned bridges | 871 | * as Apple "closed" bridge resources and bare-metal pSeries unassigned bridges |
873 | */ | 872 | */ |
874 | static int __devinit pcibios_uninitialized_bridge_resource(struct pci_bus *bus, | 873 | static int pcibios_uninitialized_bridge_resource(struct pci_bus *bus, |
875 | struct resource *res) | 874 | struct resource *res) |
876 | { | 875 | { |
877 | struct pci_controller *hose = pci_bus_to_host(bus); | 876 | struct pci_controller *hose = pci_bus_to_host(bus); |
878 | struct pci_dev *dev = bus->self; | 877 | struct pci_dev *dev = bus->self; |
@@ -933,7 +932,7 @@ static int __devinit pcibios_uninitialized_bridge_resource(struct pci_bus *bus, | |||
933 | } | 932 | } |
934 | 933 | ||
935 | /* Fixup resources of a PCI<->PCI bridge */ | 934 | /* Fixup resources of a PCI<->PCI bridge */ |
936 | static void __devinit pcibios_fixup_bridge(struct pci_bus *bus) | 935 | static void pcibios_fixup_bridge(struct pci_bus *bus) |
937 | { | 936 | { |
938 | struct resource *res; | 937 | struct resource *res; |
939 | int i; | 938 | int i; |
@@ -970,14 +969,14 @@ static void __devinit pcibios_fixup_bridge(struct pci_bus *bus) | |||
970 | } | 969 | } |
971 | } | 970 | } |
972 | 971 | ||
973 | void __devinit pcibios_setup_bus_self(struct pci_bus *bus) | 972 | void pcibios_setup_bus_self(struct pci_bus *bus) |
974 | { | 973 | { |
975 | /* Fix up the bus resources for P2P bridges */ | 974 | /* Fix up the bus resources for P2P bridges */ |
976 | if (bus->self != NULL) | 975 | if (bus->self != NULL) |
977 | pcibios_fixup_bridge(bus); | 976 | pcibios_fixup_bridge(bus); |
978 | } | 977 | } |
979 | 978 | ||
980 | void __devinit pcibios_setup_bus_devices(struct pci_bus *bus) | 979 | void pcibios_setup_bus_devices(struct pci_bus *bus) |
981 | { | 980 | { |
982 | struct pci_dev *dev; | 981 | struct pci_dev *dev; |
983 | 982 | ||
@@ -1002,7 +1001,7 @@ void __devinit pcibios_setup_bus_devices(struct pci_bus *bus) | |||
1002 | } | 1001 | } |
1003 | } | 1002 | } |
1004 | 1003 | ||
1005 | void __devinit pcibios_fixup_bus(struct pci_bus *bus) | 1004 | void pcibios_fixup_bus(struct pci_bus *bus) |
1006 | { | 1005 | { |
1007 | /* When called from the generic PCI probe, read PCI<->PCI bridge | 1006 | /* When called from the generic PCI probe, read PCI<->PCI bridge |
1008 | * bases. This is -not- called when generating the PCI tree from | 1007 | * bases. This is -not- called when generating the PCI tree from |
@@ -1188,7 +1187,7 @@ clear_resource: | |||
1188 | pcibios_allocate_bus_resources(b); | 1187 | pcibios_allocate_bus_resources(b); |
1189 | } | 1188 | } |
1190 | 1189 | ||
1191 | static inline void __devinit alloc_resource(struct pci_dev *dev, int idx) | 1190 | static inline void alloc_resource(struct pci_dev *dev, int idx) |
1192 | { | 1191 | { |
1193 | struct resource *pr, *r = &dev->resource[idx]; | 1192 | struct resource *pr, *r = &dev->resource[idx]; |
1194 | 1193 | ||
@@ -1351,7 +1350,7 @@ void __init pcibios_resource_survey(void) | |||
1351 | * rest of the code later, for now, keep it as-is as our main | 1350 | * rest of the code later, for now, keep it as-is as our main |
1352 | * resource allocation function doesn't deal with sub-trees yet. | 1351 | * resource allocation function doesn't deal with sub-trees yet. |
1353 | */ | 1352 | */ |
1354 | void __devinit pcibios_claim_one_bus(struct pci_bus *bus) | 1353 | void pcibios_claim_one_bus(struct pci_bus *bus) |
1355 | { | 1354 | { |
1356 | struct pci_dev *dev; | 1355 | struct pci_dev *dev; |
1357 | struct pci_bus *child_bus; | 1356 | struct pci_bus *child_bus; |
@@ -1410,7 +1409,8 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) | |||
1410 | return pci_enable_resources(dev, mask); | 1409 | return pci_enable_resources(dev, mask); |
1411 | } | 1410 | } |
1412 | 1411 | ||
1413 | static void __devinit pcibios_setup_phb_resources(struct pci_controller *hose, struct list_head *resources) | 1412 | static void pcibios_setup_phb_resources(struct pci_controller *hose, |
1413 | struct list_head *resources) | ||
1414 | { | 1414 | { |
1415 | unsigned long io_offset; | 1415 | unsigned long io_offset; |
1416 | struct resource *res; | 1416 | struct resource *res; |
@@ -1477,7 +1477,7 @@ struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus) | |||
1477 | return of_node_get(hose->dn); | 1477 | return of_node_get(hose->dn); |
1478 | } | 1478 | } |
1479 | 1479 | ||
1480 | static void __devinit pcibios_scan_phb(struct pci_controller *hose) | 1480 | static void pcibios_scan_phb(struct pci_controller *hose) |
1481 | { | 1481 | { |
1482 | LIST_HEAD(resources); | 1482 | LIST_HEAD(resources); |
1483 | struct pci_bus *bus; | 1483 | struct pci_bus *bus; |
diff --git a/arch/mn10300/kernel/smp.c b/arch/mn10300/kernel/smp.c index 95983cd21e77..5d7e152a23b7 100644 --- a/arch/mn10300/kernel/smp.c +++ b/arch/mn10300/kernel/smp.c | |||
@@ -905,7 +905,7 @@ void __init smp_cpus_done(unsigned int max_cpus) | |||
905 | * Set up the cpu_online_mask, cpu_callout_map and cpu_callin_map of the boot | 905 | * Set up the cpu_online_mask, cpu_callout_map and cpu_callin_map of the boot |
906 | * processor (CPU 0). | 906 | * processor (CPU 0). |
907 | */ | 907 | */ |
908 | void __devinit smp_prepare_boot_cpu(void) | 908 | void smp_prepare_boot_cpu(void) |
909 | { | 909 | { |
910 | cpumask_set_cpu(0, &cpu_callout_map); | 910 | cpumask_set_cpu(0, &cpu_callout_map); |
911 | cpumask_set_cpu(0, &cpu_callin_map); | 911 | cpumask_set_cpu(0, &cpu_callin_map); |
@@ -930,7 +930,7 @@ void initialize_secondary(void) | |||
930 | * __cpu_up - Set smp_commenced_mask for the nominated CPU | 930 | * __cpu_up - Set smp_commenced_mask for the nominated CPU |
931 | * @cpu: The target CPU. | 931 | * @cpu: The target CPU. |
932 | */ | 932 | */ |
933 | int __devinit __cpu_up(unsigned int cpu, struct task_struct *tidle) | 933 | int __cpu_up(unsigned int cpu, struct task_struct *tidle) |
934 | { | 934 | { |
935 | int timeout; | 935 | int timeout; |
936 | 936 | ||
diff --git a/arch/mn10300/unit-asb2305/pci.c b/arch/mn10300/unit-asb2305/pci.c index e2059486d3f8..6911e845b8cd 100644 --- a/arch/mn10300/unit-asb2305/pci.c +++ b/arch/mn10300/unit-asb2305/pci.c | |||
@@ -282,7 +282,7 @@ static int __init pci_check_direct(void) | |||
282 | return -ENODEV; | 282 | return -ENODEV; |
283 | } | 283 | } |
284 | 284 | ||
285 | static int __devinit is_valid_resource(struct pci_dev *dev, int idx) | 285 | static int is_valid_resource(struct pci_dev *dev, int idx) |
286 | { | 286 | { |
287 | unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM; | 287 | unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM; |
288 | struct resource *devr = &dev->resource[idx], *busr; | 288 | struct resource *devr = &dev->resource[idx], *busr; |
@@ -302,7 +302,7 @@ static int __devinit is_valid_resource(struct pci_dev *dev, int idx) | |||
302 | return 0; | 302 | return 0; |
303 | } | 303 | } |
304 | 304 | ||
305 | static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev) | 305 | static void pcibios_fixup_device_resources(struct pci_dev *dev) |
306 | { | 306 | { |
307 | int limit, i; | 307 | int limit, i; |
308 | 308 | ||
@@ -325,7 +325,7 @@ static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev) | |||
325 | * Called after each bus is probed, but before its children | 325 | * Called after each bus is probed, but before its children |
326 | * are examined. | 326 | * are examined. |
327 | */ | 327 | */ |
328 | void __devinit pcibios_fixup_bus(struct pci_bus *bus) | 328 | void pcibios_fixup_bus(struct pci_bus *bus) |
329 | { | 329 | { |
330 | struct pci_dev *dev; | 330 | struct pci_dev *dev; |
331 | 331 | ||
diff --git a/arch/openrisc/lib/delay.c b/arch/openrisc/lib/delay.c index c330767c9217..c82b09f4a106 100644 --- a/arch/openrisc/lib/delay.c +++ b/arch/openrisc/lib/delay.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <asm/timex.h> | 22 | #include <asm/timex.h> |
23 | #include <asm/processor.h> | 23 | #include <asm/processor.h> |
24 | 24 | ||
25 | int __devinit read_current_timer(unsigned long *timer_value) | 25 | int read_current_timer(unsigned long *timer_value) |
26 | { | 26 | { |
27 | *timer_value = mfspr(SPR_TTCR); | 27 | *timer_value = mfspr(SPR_TTCR); |
28 | return 0; | 28 | return 0; |
diff --git a/arch/parisc/include/asm/parport.h b/arch/parisc/include/asm/parport.h index 00d9cc3e7b97..c391d7cbc223 100644 --- a/arch/parisc/include/asm/parport.h +++ b/arch/parisc/include/asm/parport.h | |||
@@ -8,7 +8,7 @@ | |||
8 | #define _ASM_PARPORT_H 1 | 8 | #define _ASM_PARPORT_H 1 |
9 | 9 | ||
10 | 10 | ||
11 | static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma) | 11 | static int parport_pc_find_nonpci_ports (int autoirq, int autodma) |
12 | { | 12 | { |
13 | /* nothing ! */ | 13 | /* nothing ! */ |
14 | return 0; | 14 | return 0; |
diff --git a/arch/parisc/kernel/hardware.c b/arch/parisc/kernel/hardware.c index f48a640b55fb..f7752f6af29e 100644 --- a/arch/parisc/kernel/hardware.c +++ b/arch/parisc/kernel/hardware.c | |||
@@ -38,7 +38,7 @@ | |||
38 | * so don't reference this table after starting the init process | 38 | * so don't reference this table after starting the init process |
39 | */ | 39 | */ |
40 | 40 | ||
41 | static struct hp_hardware hp_hardware_list[] __devinitdata = { | 41 | static struct hp_hardware hp_hardware_list[] = { |
42 | {HPHW_NPROC,0x01,0x4,0x0,"Indigo (840, 930)"}, | 42 | {HPHW_NPROC,0x01,0x4,0x0,"Indigo (840, 930)"}, |
43 | {HPHW_NPROC,0x8,0x4,0x01,"Firefox(825,925)"}, | 43 | {HPHW_NPROC,0x8,0x4,0x01,"Firefox(825,925)"}, |
44 | {HPHW_NPROC,0xA,0x4,0x01,"Top Gun (835,834,935,635)"}, | 44 | {HPHW_NPROC,0xA,0x4,0x01,"Top Gun (835,834,935,635)"}, |
@@ -1230,7 +1230,7 @@ static struct hp_cpu_type_mask { | |||
1230 | unsigned short model; | 1230 | unsigned short model; |
1231 | unsigned short mask; | 1231 | unsigned short mask; |
1232 | enum cpu_type cpu; | 1232 | enum cpu_type cpu; |
1233 | } hp_cpu_type_mask_list[] __devinitdata = { | 1233 | } hp_cpu_type_mask_list[] = { |
1234 | 1234 | ||
1235 | { 0x0000, 0x0ff0, pcx }, /* 0x0000 - 0x000f */ | 1235 | { 0x0000, 0x0ff0, pcx }, /* 0x0000 - 0x000f */ |
1236 | { 0x0048, 0x0ff0, pcxl }, /* 0x0040 - 0x004f */ | 1236 | { 0x0048, 0x0ff0, pcxl }, /* 0x0040 - 0x004f */ |
@@ -1327,8 +1327,7 @@ const char * const cpu_name_version[][2] = { | |||
1327 | [mako2] = { "PA8900 (Shortfin)", "2.0" } | 1327 | [mako2] = { "PA8900 (Shortfin)", "2.0" } |
1328 | }; | 1328 | }; |
1329 | 1329 | ||
1330 | const char * __devinit | 1330 | const char *parisc_hardware_description(struct parisc_device_id *id) |
1331 | parisc_hardware_description(struct parisc_device_id *id) | ||
1332 | { | 1331 | { |
1333 | struct hp_hardware *listptr; | 1332 | struct hp_hardware *listptr; |
1334 | 1333 | ||
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index ea431e551c6b..0b45baa55438 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c | |||
@@ -623,10 +623,9 @@ static struct sclp_cpu_info *smp_get_cpu_info(void) | |||
623 | return info; | 623 | return info; |
624 | } | 624 | } |
625 | 625 | ||
626 | static int __devinit smp_add_present_cpu(int cpu); | 626 | static int smp_add_present_cpu(int cpu); |
627 | 627 | ||
628 | static int __devinit __smp_rescan_cpus(struct sclp_cpu_info *info, | 628 | static int __smp_rescan_cpus(struct sclp_cpu_info *info, int sysfs_add) |
629 | int sysfs_add) | ||
630 | { | 629 | { |
631 | struct pcpu *pcpu; | 630 | struct pcpu *pcpu; |
632 | cpumask_t avail; | 631 | cpumask_t avail; |
@@ -986,7 +985,7 @@ static int __cpuinit smp_cpu_notify(struct notifier_block *self, | |||
986 | return notifier_from_errno(err); | 985 | return notifier_from_errno(err); |
987 | } | 986 | } |
988 | 987 | ||
989 | static int __devinit smp_add_present_cpu(int cpu) | 988 | static int smp_add_present_cpu(int cpu) |
990 | { | 989 | { |
991 | struct cpu *c = &pcpu_devices[cpu].cpu; | 990 | struct cpu *c = &pcpu_devices[cpu].cpu; |
992 | struct device *s = &c->dev; | 991 | struct device *s = &c->dev; |
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c index 8fa416b8775f..ff49427e9941 100644 --- a/arch/s390/pci/pci.c +++ b/arch/s390/pci/pci.c | |||
@@ -385,7 +385,7 @@ unsigned int probe_irq_mask(unsigned long val) | |||
385 | } | 385 | } |
386 | EXPORT_SYMBOL_GPL(probe_irq_mask); | 386 | EXPORT_SYMBOL_GPL(probe_irq_mask); |
387 | 387 | ||
388 | void __devinit pcibios_fixup_bus(struct pci_bus *bus) | 388 | void pcibios_fixup_bus(struct pci_bus *bus) |
389 | { | 389 | { |
390 | } | 390 | } |
391 | 391 | ||
diff --git a/arch/score/mm/cache.c b/arch/score/mm/cache.c index b25e95743600..f85ec1a7c88e 100644 --- a/arch/score/mm/cache.c +++ b/arch/score/mm/cache.c | |||
@@ -113,7 +113,7 @@ static inline void setup_protection_map(void) | |||
113 | protection_map[15] = PAGE_SHARED; | 113 | protection_map[15] = PAGE_SHARED; |
114 | } | 114 | } |
115 | 115 | ||
116 | void __devinit cpu_cache_init(void) | 116 | void cpu_cache_init(void) |
117 | { | 117 | { |
118 | setup_protection_map(); | 118 | setup_protection_map(); |
119 | } | 119 | } |
diff --git a/arch/sh/drivers/pci/fixups-dreamcast.c b/arch/sh/drivers/pci/fixups-dreamcast.c index a5fe1b54c952..d6cde700e316 100644 --- a/arch/sh/drivers/pci/fixups-dreamcast.c +++ b/arch/sh/drivers/pci/fixups-dreamcast.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include <asm/irq.h> | 28 | #include <asm/irq.h> |
29 | #include <mach/pci.h> | 29 | #include <mach/pci.h> |
30 | 30 | ||
31 | static void __devinit gapspci_fixup_resources(struct pci_dev *dev) | 31 | static void gapspci_fixup_resources(struct pci_dev *dev) |
32 | { | 32 | { |
33 | struct pci_channel *p = dev->sysdata; | 33 | struct pci_channel *p = dev->sysdata; |
34 | 34 | ||
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c index 81e5dafed3e4..102f5d58b037 100644 --- a/arch/sh/drivers/pci/pci.c +++ b/arch/sh/drivers/pci/pci.c | |||
@@ -32,7 +32,7 @@ static struct pci_channel *hose_head, **hose_tail = &hose_head; | |||
32 | 32 | ||
33 | static int pci_initialized; | 33 | static int pci_initialized; |
34 | 34 | ||
35 | static void __devinit pcibios_scanbus(struct pci_channel *hose) | 35 | static void pcibios_scanbus(struct pci_channel *hose) |
36 | { | 36 | { |
37 | static int next_busno; | 37 | static int next_busno; |
38 | static int need_domain_info; | 38 | static int need_domain_info; |
@@ -82,7 +82,7 @@ static void __devinit pcibios_scanbus(struct pci_channel *hose) | |||
82 | DEFINE_RAW_SPINLOCK(pci_config_lock); | 82 | DEFINE_RAW_SPINLOCK(pci_config_lock); |
83 | static DEFINE_MUTEX(pci_scan_mutex); | 83 | static DEFINE_MUTEX(pci_scan_mutex); |
84 | 84 | ||
85 | int __devinit register_pci_controller(struct pci_channel *hose) | 85 | int register_pci_controller(struct pci_channel *hose) |
86 | { | 86 | { |
87 | int i; | 87 | int i; |
88 | 88 | ||
@@ -156,7 +156,7 @@ subsys_initcall(pcibios_init); | |||
156 | * Called after each bus is probed, but before its children | 156 | * Called after each bus is probed, but before its children |
157 | * are examined. | 157 | * are examined. |
158 | */ | 158 | */ |
159 | void __devinit pcibios_fixup_bus(struct pci_bus *bus) | 159 | void pcibios_fixup_bus(struct pci_bus *bus) |
160 | { | 160 | { |
161 | } | 161 | } |
162 | 162 | ||
diff --git a/arch/sh/drivers/pci/pcie-sh7786.c b/arch/sh/drivers/pci/pcie-sh7786.c index 9e702f2f8045..c2c85f6cd738 100644 --- a/arch/sh/drivers/pci/pcie-sh7786.c +++ b/arch/sh/drivers/pci/pcie-sh7786.c | |||
@@ -132,7 +132,7 @@ static struct clk fixed_pciexclkp = { | |||
132 | .rate = 100000000, /* 100 MHz reference clock */ | 132 | .rate = 100000000, /* 100 MHz reference clock */ |
133 | }; | 133 | }; |
134 | 134 | ||
135 | static void __devinit sh7786_pci_fixup(struct pci_dev *dev) | 135 | static void sh7786_pci_fixup(struct pci_dev *dev) |
136 | { | 136 | { |
137 | /* | 137 | /* |
138 | * Prevent enumeration of root complex resources. | 138 | * Prevent enumeration of root complex resources. |
diff --git a/arch/tile/include/asm/pci.h b/arch/tile/include/asm/pci.h index 302cdf71ceed..54a924208d3c 100644 --- a/arch/tile/include/asm/pci.h +++ b/arch/tile/include/asm/pci.h | |||
@@ -188,7 +188,7 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *); | |||
188 | int __init tile_pci_init(void); | 188 | int __init tile_pci_init(void); |
189 | int __init pcibios_init(void); | 189 | int __init pcibios_init(void); |
190 | 190 | ||
191 | void __devinit pcibios_fixup_bus(struct pci_bus *bus); | 191 | void pcibios_fixup_bus(struct pci_bus *bus); |
192 | 192 | ||
193 | #define pci_domain_nr(bus) (((struct pci_controller *)(bus)->sysdata)->index) | 193 | #define pci_domain_nr(bus) (((struct pci_controller *)(bus)->sysdata)->index) |
194 | 194 | ||
diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c index aac1cd586966..67237d34c2e2 100644 --- a/arch/tile/kernel/pci.c +++ b/arch/tile/kernel/pci.c | |||
@@ -81,7 +81,7 @@ EXPORT_SYMBOL(pcibios_align_resource); | |||
81 | * controller_id is the controller number, config type is 0 or 1 for | 81 | * controller_id is the controller number, config type is 0 or 1 for |
82 | * config0 or config1 operations. | 82 | * config0 or config1 operations. |
83 | */ | 83 | */ |
84 | static int __devinit tile_pcie_open(int controller_id, int config_type) | 84 | static int tile_pcie_open(int controller_id, int config_type) |
85 | { | 85 | { |
86 | char filename[32]; | 86 | char filename[32]; |
87 | int fd; | 87 | int fd; |
@@ -97,8 +97,7 @@ static int __devinit tile_pcie_open(int controller_id, int config_type) | |||
97 | /* | 97 | /* |
98 | * Get the IRQ numbers from the HV and set up the handlers for them. | 98 | * Get the IRQ numbers from the HV and set up the handlers for them. |
99 | */ | 99 | */ |
100 | static int __devinit tile_init_irqs(int controller_id, | 100 | static int tile_init_irqs(int controller_id, struct pci_controller *controller) |
101 | struct pci_controller *controller) | ||
102 | { | 101 | { |
103 | char filename[32]; | 102 | char filename[32]; |
104 | int fd; | 103 | int fd; |
@@ -237,7 +236,7 @@ static int tile_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) | |||
237 | } | 236 | } |
238 | 237 | ||
239 | 238 | ||
240 | static void __devinit fixup_read_and_payload_sizes(void) | 239 | static void fixup_read_and_payload_sizes(void) |
241 | { | 240 | { |
242 | struct pci_dev *dev = NULL; | 241 | struct pci_dev *dev = NULL; |
243 | int smallest_max_payload = 0x1; /* Tile maxes out at 256 bytes. */ | 242 | int smallest_max_payload = 0x1; /* Tile maxes out at 256 bytes. */ |
@@ -379,7 +378,7 @@ subsys_initcall(pcibios_init); | |||
379 | /* | 378 | /* |
380 | * No bus fixups needed. | 379 | * No bus fixups needed. |
381 | */ | 380 | */ |
382 | void __devinit pcibios_fixup_bus(struct pci_bus *bus) | 381 | void pcibios_fixup_bus(struct pci_bus *bus) |
383 | { | 382 | { |
384 | /* Nothing needs to be done. */ | 383 | /* Nothing needs to be done. */ |
385 | } | 384 | } |
@@ -458,11 +457,8 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) | |||
458 | * specified bus & slot. | 457 | * specified bus & slot. |
459 | */ | 458 | */ |
460 | 459 | ||
461 | static int __devinit tile_cfg_read(struct pci_bus *bus, | 460 | static int tile_cfg_read(struct pci_bus *bus, unsigned int devfn, int offset, |
462 | unsigned int devfn, | 461 | int size, u32 *val) |
463 | int offset, | ||
464 | int size, | ||
465 | u32 *val) | ||
466 | { | 462 | { |
467 | struct pci_controller *controller = bus->sysdata; | 463 | struct pci_controller *controller = bus->sysdata; |
468 | int busnum = bus->number & 0xff; | 464 | int busnum = bus->number & 0xff; |
@@ -504,11 +500,8 @@ static int __devinit tile_cfg_read(struct pci_bus *bus, | |||
504 | * See tile_cfg_read() for relevant comments. | 500 | * See tile_cfg_read() for relevant comments. |
505 | * Note that "val" is the value to write, not a pointer to that value. | 501 | * Note that "val" is the value to write, not a pointer to that value. |
506 | */ | 502 | */ |
507 | static int __devinit tile_cfg_write(struct pci_bus *bus, | 503 | static int tile_cfg_write(struct pci_bus *bus, unsigned int devfn, int offset, |
508 | unsigned int devfn, | 504 | int size, u32 val) |
509 | int offset, | ||
510 | int size, | ||
511 | u32 val) | ||
512 | { | 505 | { |
513 | struct pci_controller *controller = bus->sysdata; | 506 | struct pci_controller *controller = bus->sysdata; |
514 | int busnum = bus->number & 0xff; | 507 | int busnum = bus->number & 0xff; |
diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c index 94810d4a6332..11425633b2d7 100644 --- a/arch/tile/kernel/pci_gx.c +++ b/arch/tile/kernel/pci_gx.c | |||
@@ -58,10 +58,10 @@ | |||
58 | #define TRACE_CFG_RD(...) | 58 | #define TRACE_CFG_RD(...) |
59 | #endif | 59 | #endif |
60 | 60 | ||
61 | static int __devinitdata pci_probe = 1; | 61 | static int pci_probe = 1; |
62 | 62 | ||
63 | /* Information on the PCIe RC ports configuration. */ | 63 | /* Information on the PCIe RC ports configuration. */ |
64 | static int __devinitdata pcie_rc[TILEGX_NUM_TRIO][TILEGX_TRIO_PCIES]; | 64 | static int pcie_rc[TILEGX_NUM_TRIO][TILEGX_TRIO_PCIES]; |
65 | 65 | ||
66 | /* | 66 | /* |
67 | * On some platforms with one or more Gx endpoint ports, we need to | 67 | * On some platforms with one or more Gx endpoint ports, we need to |
@@ -72,7 +72,7 @@ static int __devinitdata pcie_rc[TILEGX_NUM_TRIO][TILEGX_TRIO_PCIES]; | |||
72 | * the delay in seconds. If the delay is not provided, the value | 72 | * the delay in seconds. If the delay is not provided, the value |
73 | * will be DEFAULT_RC_DELAY. | 73 | * will be DEFAULT_RC_DELAY. |
74 | */ | 74 | */ |
75 | static int __devinitdata rc_delay[TILEGX_NUM_TRIO][TILEGX_TRIO_PCIES]; | 75 | static int rc_delay[TILEGX_NUM_TRIO][TILEGX_TRIO_PCIES]; |
76 | 76 | ||
77 | /* Default number of seconds that the PCIe RC port probe can be delayed. */ | 77 | /* Default number of seconds that the PCIe RC port probe can be delayed. */ |
78 | #define DEFAULT_RC_DELAY 10 | 78 | #define DEFAULT_RC_DELAY 10 |
@@ -137,7 +137,7 @@ static int tile_irq_cpu(int irq) | |||
137 | /* | 137 | /* |
138 | * Open a file descriptor to the TRIO shim. | 138 | * Open a file descriptor to the TRIO shim. |
139 | */ | 139 | */ |
140 | static int __devinit tile_pcie_open(int trio_index) | 140 | static int tile_pcie_open(int trio_index) |
141 | { | 141 | { |
142 | gxio_trio_context_t *context = &trio_contexts[trio_index]; | 142 | gxio_trio_context_t *context = &trio_contexts[trio_index]; |
143 | int ret; | 143 | int ret; |
@@ -265,7 +265,7 @@ trio_handle_level_irq(unsigned int irq, struct irq_desc *desc) | |||
265 | * Create kernel irqs and set up the handlers for the legacy interrupts. | 265 | * Create kernel irqs and set up the handlers for the legacy interrupts. |
266 | * Also some minimum initialization for the MSI support. | 266 | * Also some minimum initialization for the MSI support. |
267 | */ | 267 | */ |
268 | static int __devinit tile_init_irqs(struct pci_controller *controller) | 268 | static int tile_init_irqs(struct pci_controller *controller) |
269 | { | 269 | { |
270 | int i; | 270 | int i; |
271 | int j; | 271 | int j; |
@@ -459,8 +459,7 @@ static int tile_map_irq(const struct pci_dev *dev, u8 device, u8 pin) | |||
459 | } | 459 | } |
460 | 460 | ||
461 | 461 | ||
462 | static void __devinit fixup_read_and_payload_sizes(struct pci_controller * | 462 | static void fixup_read_and_payload_sizes(struct pci_controller *controller) |
463 | controller) | ||
464 | { | 463 | { |
465 | gxio_trio_context_t *trio_context = controller->trio; | 464 | gxio_trio_context_t *trio_context = controller->trio; |
466 | struct pci_bus *root_bus = controller->root_bus; | 465 | struct pci_bus *root_bus = controller->root_bus; |
@@ -541,7 +540,7 @@ static void __devinit fixup_read_and_payload_sizes(struct pci_controller * | |||
541 | } | 540 | } |
542 | } | 541 | } |
543 | 542 | ||
544 | static int __devinit setup_pcie_rc_delay(char *str) | 543 | static int setup_pcie_rc_delay(char *str) |
545 | { | 544 | { |
546 | unsigned long delay = 0; | 545 | unsigned long delay = 0; |
547 | unsigned long trio_index; | 546 | unsigned long trio_index; |
@@ -1016,7 +1015,7 @@ alloc_mem_map_failed: | |||
1016 | subsys_initcall(pcibios_init); | 1015 | subsys_initcall(pcibios_init); |
1017 | 1016 | ||
1018 | /* Note: to be deleted after Linux 3.6 merge. */ | 1017 | /* Note: to be deleted after Linux 3.6 merge. */ |
1019 | void __devinit pcibios_fixup_bus(struct pci_bus *bus) | 1018 | void pcibios_fixup_bus(struct pci_bus *bus) |
1020 | { | 1019 | { |
1021 | } | 1020 | } |
1022 | 1021 | ||
@@ -1024,7 +1023,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus) | |||
1024 | * This can be called from the generic PCI layer, but doesn't need to | 1023 | * This can be called from the generic PCI layer, but doesn't need to |
1025 | * do anything. | 1024 | * do anything. |
1026 | */ | 1025 | */ |
1027 | char __devinit *pcibios_setup(char *str) | 1026 | char *pcibios_setup(char *str) |
1028 | { | 1027 | { |
1029 | if (!strcmp(str, "off")) { | 1028 | if (!strcmp(str, "off")) { |
1030 | pci_probe = 0; | 1029 | pci_probe = 0; |
@@ -1143,11 +1142,8 @@ EXPORT_SYMBOL(pci_iounmap); | |||
1143 | * specified bus & device. | 1142 | * specified bus & device. |
1144 | */ | 1143 | */ |
1145 | 1144 | ||
1146 | static int __devinit tile_cfg_read(struct pci_bus *bus, | 1145 | static int tile_cfg_read(struct pci_bus *bus, unsigned int devfn, int offset, |
1147 | unsigned int devfn, | 1146 | int size, u32 *val) |
1148 | int offset, | ||
1149 | int size, | ||
1150 | u32 *val) | ||
1151 | { | 1147 | { |
1152 | struct pci_controller *controller = bus->sysdata; | 1148 | struct pci_controller *controller = bus->sysdata; |
1153 | gxio_trio_context_t *trio_context = controller->trio; | 1149 | gxio_trio_context_t *trio_context = controller->trio; |
@@ -1271,11 +1267,8 @@ invalid_device: | |||
1271 | * See tile_cfg_read() for relevent comments. | 1267 | * See tile_cfg_read() for relevent comments. |
1272 | * Note that "val" is the value to write, not a pointer to that value. | 1268 | * Note that "val" is the value to write, not a pointer to that value. |
1273 | */ | 1269 | */ |
1274 | static int __devinit tile_cfg_write(struct pci_bus *bus, | 1270 | static int tile_cfg_write(struct pci_bus *bus, unsigned int devfn, int offset, |
1275 | unsigned int devfn, | 1271 | int size, u32 val) |
1276 | int offset, | ||
1277 | int size, | ||
1278 | u32 val) | ||
1279 | { | 1272 | { |
1280 | struct pci_controller *controller = bus->sysdata; | 1273 | struct pci_controller *controller = bus->sysdata; |
1281 | gxio_trio_context_t *trio_context = controller->trio; | 1274 | gxio_trio_context_t *trio_context = controller->trio; |
diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c index 7c4359240b81..ef69c0c82825 100644 --- a/arch/unicore32/kernel/pci.c +++ b/arch/unicore32/kernel/pci.c | |||
@@ -167,7 +167,7 @@ static inline int pdev_bad_for_parity(struct pci_dev *dev) | |||
167 | * pcibios_fixup_bus - Called after each bus is probed, | 167 | * pcibios_fixup_bus - Called after each bus is probed, |
168 | * but before its children are examined. | 168 | * but before its children are examined. |
169 | */ | 169 | */ |
170 | void __devinit pcibios_fixup_bus(struct pci_bus *bus) | 170 | void pcibios_fixup_bus(struct pci_bus *bus) |
171 | { | 171 | { |
172 | struct pci_dev *dev; | 172 | struct pci_dev *dev; |
173 | u16 features = PCI_COMMAND_SERR | 173 | u16 features = PCI_COMMAND_SERR |