mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
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 <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
a0ca990960
commit
b6ce068a12
14 changed files with 78 additions and 85 deletions
|
|
@ -200,15 +200,6 @@ acpi_status __init acpi_os_initialize(void)
|
|||
|
||||
acpi_status acpi_os_initialize1(void)
|
||||
{
|
||||
/*
|
||||
* Initialize PCI configuration space access, as we'll need to access
|
||||
* it while walking the namespace (bus 0 and root bridges w/ _BBNs).
|
||||
*/
|
||||
if (!raw_pci_ops) {
|
||||
printk(KERN_ERR PREFIX
|
||||
"Access to PCI configuration space unavailable\n");
|
||||
return AE_NULL_ENTRY;
|
||||
}
|
||||
kacpid_wq = create_singlethread_workqueue("kacpid");
|
||||
kacpi_notify_wq = create_singlethread_workqueue("kacpi_notify");
|
||||
BUG_ON(!kacpid_wq);
|
||||
|
|
@ -653,11 +644,9 @@ acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
|
|||
return AE_ERROR;
|
||||
}
|
||||
|
||||
BUG_ON(!raw_pci_ops);
|
||||
|
||||
result = raw_pci_ops->read(pci_id->segment, pci_id->bus,
|
||||
PCI_DEVFN(pci_id->device, pci_id->function),
|
||||
reg, size, value);
|
||||
result = raw_pci_read(pci_id->segment, pci_id->bus,
|
||||
PCI_DEVFN(pci_id->device, pci_id->function),
|
||||
reg, size, value);
|
||||
|
||||
return (result ? AE_ERROR : AE_OK);
|
||||
}
|
||||
|
|
@ -682,11 +671,9 @@ acpi_os_write_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
|
|||
return AE_ERROR;
|
||||
}
|
||||
|
||||
BUG_ON(!raw_pci_ops);
|
||||
|
||||
result = raw_pci_ops->write(pci_id->segment, pci_id->bus,
|
||||
PCI_DEVFN(pci_id->device, pci_id->function),
|
||||
reg, size, value);
|
||||
result = raw_pci_write(pci_id->segment, pci_id->bus,
|
||||
PCI_DEVFN(pci_id->device, pci_id->function),
|
||||
reg, size, value);
|
||||
|
||||
return (result ? AE_ERROR : AE_OK);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue