aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/pci/mmconfig_64.c
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew@wil.cx>2008-02-10 09:45:28 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-10 15:52:46 -0500
commitb6ce068a1285a24185b01be8a49021827516b3e1 (patch)
treeea1420fefff86f2e2ee4ed83f08ec2dd99a86dc5 /arch/x86/pci/mmconfig_64.c
parenta0ca9909609470ad779b9b9cc68ce96e975afff7 (diff)
Change pci_raw_ops to pci_raw_read/write
We want to allow different implementations of pci_raw_ops for standard and extended config space on x86. Rather than clutter generic code with knowledge of this, we make pci_raw_ops private to x86 and use it to implement the new raw interface -- raw_pci_read() and raw_pci_write(). Signed-off-by: Matthew Wilcox <willy@linux.intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86/pci/mmconfig_64.c')
-rw-r--r--arch/x86/pci/mmconfig_64.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/x86/pci/mmconfig_64.c b/arch/x86/pci/mmconfig_64.c
index c4cf318e44a9..9207fd49233c 100644
--- a/arch/x86/pci/mmconfig_64.c
+++ b/arch/x86/pci/mmconfig_64.c
@@ -58,9 +58,6 @@ err: *value = -1;
58 return -EINVAL; 58 return -EINVAL;
59 } 59 }
60 60
61 if (reg < 256)
62 return pci_conf1_read(seg,bus,devfn,reg,len,value);
63
64 addr = pci_dev_base(seg, bus, devfn); 61 addr = pci_dev_base(seg, bus, devfn);
65 if (!addr) 62 if (!addr)
66 goto err; 63 goto err;
@@ -89,9 +86,6 @@ static int pci_mmcfg_write(unsigned int seg, unsigned int bus,
89 if (unlikely((bus > 255) || (devfn > 255) || (reg > 4095))) 86 if (unlikely((bus > 255) || (devfn > 255) || (reg > 4095)))
90 return -EINVAL; 87 return -EINVAL;
91 88
92 if (reg < 256)
93 return pci_conf1_write(seg,bus,devfn,reg,len,value);
94
95 addr = pci_dev_base(seg, bus, devfn); 89 addr = pci_dev_base(seg, bus, devfn);
96 if (!addr) 90 if (!addr)
97 return -EINVAL; 91 return -EINVAL;
@@ -150,6 +144,6 @@ int __init pci_mmcfg_arch_init(void)
150 return 0; 144 return 0;
151 } 145 }
152 } 146 }
153 raw_pci_ops = &pci_mmcfg; 147 raw_pci_ext_ops = &pci_mmcfg;
154 return 1; 148 return 1;
155} 149}