diff options
author | Rob Herring <rob.herring@calxeda.com> | 2011-07-12 10:25:51 -0400 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2011-07-12 10:28:04 -0400 |
commit | 0e47ff1ce65bbd0b12a9421a2756b26987ea5083 (patch) | |
tree | aa15e9928332fbba8caf93a17d7aaecce4a10209 /arch/powerpc/platforms/44x | |
parent | fe0d42203cb5616eeff68b14576a0f7e2dd56625 (diff) |
powerpc: rename ppc_pci_*_flags to pci_*_flags
This renames pci flags functions and enums in preparation for creating
generic version in asm-generic/pci-bridge.h. The following search and
replace is done:
s/ppc_pci_/pci_/
s/PPC_PCI_/PCI_/
Direct accesses to ppc_pci_flag variable are replaced with helper
functions.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/44x')
-rw-r--r-- | arch/powerpc/platforms/44x/canyonlands.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/44x/ebony.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/44x/ppc44x_simple.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/44x/sam440ep.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/44x/canyonlands.c b/arch/powerpc/platforms/44x/canyonlands.c index afc5e8ea3775..e300dd4c89bf 100644 --- a/arch/powerpc/platforms/44x/canyonlands.c +++ b/arch/powerpc/platforms/44x/canyonlands.c | |||
@@ -55,7 +55,7 @@ static int __init ppc460ex_probe(void) | |||
55 | { | 55 | { |
56 | unsigned long root = of_get_flat_dt_root(); | 56 | unsigned long root = of_get_flat_dt_root(); |
57 | if (of_flat_dt_is_compatible(root, "amcc,canyonlands")) { | 57 | if (of_flat_dt_is_compatible(root, "amcc,canyonlands")) { |
58 | ppc_pci_set_flags(PPC_PCI_REASSIGN_ALL_RSRC); | 58 | pci_set_flags(PCI_REASSIGN_ALL_RSRC); |
59 | return 1; | 59 | return 1; |
60 | } | 60 | } |
61 | return 0; | 61 | return 0; |
diff --git a/arch/powerpc/platforms/44x/ebony.c b/arch/powerpc/platforms/44x/ebony.c index 88b9117fa691..6a4232bbdf88 100644 --- a/arch/powerpc/platforms/44x/ebony.c +++ b/arch/powerpc/platforms/44x/ebony.c | |||
@@ -54,7 +54,7 @@ static int __init ebony_probe(void) | |||
54 | if (!of_flat_dt_is_compatible(root, "ibm,ebony")) | 54 | if (!of_flat_dt_is_compatible(root, "ibm,ebony")) |
55 | return 0; | 55 | return 0; |
56 | 56 | ||
57 | ppc_pci_set_flags(PPC_PCI_REASSIGN_ALL_RSRC); | 57 | pci_set_flags(PCI_REASSIGN_ALL_RSRC); |
58 | 58 | ||
59 | return 1; | 59 | return 1; |
60 | } | 60 | } |
diff --git a/arch/powerpc/platforms/44x/ppc44x_simple.c b/arch/powerpc/platforms/44x/ppc44x_simple.c index c81c19c0b3d4..8d2202763415 100644 --- a/arch/powerpc/platforms/44x/ppc44x_simple.c +++ b/arch/powerpc/platforms/44x/ppc44x_simple.c | |||
@@ -72,7 +72,7 @@ static int __init ppc44x_probe(void) | |||
72 | 72 | ||
73 | for (i = 0; i < ARRAY_SIZE(board); i++) { | 73 | for (i = 0; i < ARRAY_SIZE(board); i++) { |
74 | if (of_flat_dt_is_compatible(root, board[i])) { | 74 | if (of_flat_dt_is_compatible(root, board[i])) { |
75 | ppc_pci_set_flags(PPC_PCI_REASSIGN_ALL_RSRC); | 75 | pci_set_flags(PCI_REASSIGN_ALL_RSRC); |
76 | return 1; | 76 | return 1; |
77 | } | 77 | } |
78 | } | 78 | } |
diff --git a/arch/powerpc/platforms/44x/sam440ep.c b/arch/powerpc/platforms/44x/sam440ep.c index a78e8eb6da41..9e09b835758b 100644 --- a/arch/powerpc/platforms/44x/sam440ep.c +++ b/arch/powerpc/platforms/44x/sam440ep.c | |||
@@ -51,7 +51,7 @@ static int __init sam440ep_probe(void) | |||
51 | if (!of_flat_dt_is_compatible(root, "acube,sam440ep")) | 51 | if (!of_flat_dt_is_compatible(root, "acube,sam440ep")) |
52 | return 0; | 52 | return 0; |
53 | 53 | ||
54 | ppc_pci_set_flags(PPC_PCI_REASSIGN_ALL_RSRC); | 54 | pci_set_flags(PCI_REASSIGN_ALL_RSRC); |
55 | 55 | ||
56 | return 1; | 56 | return 1; |
57 | } | 57 | } |