aboutsummaryrefslogtreecommitdiffstats
path: root/arch/microblaze/pci
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-21 17:06:37 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-03 18:57:13 -0500
commitb881bc469bdbdcca60e75047885509eb9886d3a2 (patch)
tree5eb755591b667df0f04d7355544de613143458a7 /arch/microblaze/pci
parentf8d6c8d98d9ea7afef1e0d93d756a2dca879d1ea (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>
Diffstat (limited to 'arch/microblaze/pci')
-rw-r--r--arch/microblaze/pci/pci-common.c28
1 files changed, 14 insertions, 14 deletions
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 */
658void __devinit pci_process_bridge_OF_ranges(struct pci_controller *hose, 658void 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 */
833static void __devinit pcibios_fixup_resources(struct pci_dev *dev) 832static 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 */
874static int __devinit pcibios_uninitialized_bridge_resource(struct pci_bus *bus, 873static 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 */
936static void __devinit pcibios_fixup_bridge(struct pci_bus *bus) 935static 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
973void __devinit pcibios_setup_bus_self(struct pci_bus *bus) 972void 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
980void __devinit pcibios_setup_bus_devices(struct pci_bus *bus) 979void 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
1005void __devinit pcibios_fixup_bus(struct pci_bus *bus) 1004void 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
1191static inline void __devinit alloc_resource(struct pci_dev *dev, int idx) 1190static 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 */
1354void __devinit pcibios_claim_one_bus(struct pci_bus *bus) 1353void 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
1413static void __devinit pcibios_setup_phb_resources(struct pci_controller *hose, struct list_head *resources) 1412static 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
1480static void __devinit pcibios_scan_phb(struct pci_controller *hose) 1480static 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;