projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PCI/MSI: Rename mask/unmask_msi_irq treewide
[firefly-linux-kernel-4.4.55.git]
/
arch
/
x86
/
kernel
/
apic
/
io_apic.c
diff --git
a/arch/x86/kernel/apic/io_apic.c
b/arch/x86/kernel/apic/io_apic.c
index 1183d545da1e95a56233f39baf8047a38c77fe22..7ffe0a2b870f030c055ffa6888df2f84480f404f 100644
(file)
--- a/
arch/x86/kernel/apic/io_apic.c
+++ b/
arch/x86/kernel/apic/io_apic.c
@@
-3158,7
+3158,7
@@
msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)
msg.address_lo &= ~MSI_ADDR_DEST_ID_MASK;
msg.address_lo |= MSI_ADDR_DEST_ID(dest);
msg.address_lo &= ~MSI_ADDR_DEST_ID_MASK;
msg.address_lo |= MSI_ADDR_DEST_ID(dest);
- __write_msi_msg(data->msi_desc, &msg);
+ __
pci_
write_msi_msg(data->msi_desc, &msg);
return IRQ_SET_MASK_OK_NOCOPY;
}
return IRQ_SET_MASK_OK_NOCOPY;
}
@@
-3169,8
+3169,8
@@
msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)
*/
static struct irq_chip msi_chip = {
.name = "PCI-MSI",
*/
static struct irq_chip msi_chip = {
.name = "PCI-MSI",
- .irq_unmask =
unmask_msi
_irq,
- .irq_mask =
mask_msi
_irq,
+ .irq_unmask =
pci_msi_unmask
_irq,
+ .irq_mask =
pci_msi_mask
_irq,
.irq_ack = ack_apic_edge,
.irq_set_affinity = msi_set_affinity,
.irq_retrigger = ioapic_retrigger_irq,
.irq_ack = ack_apic_edge,
.irq_set_affinity = msi_set_affinity,
.irq_retrigger = ioapic_retrigger_irq,
@@
-3196,7
+3196,7
@@
int setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc,
* MSI message denotes a contiguous group of IRQs, written for 0th IRQ.
*/
if (!irq_offset)
* MSI message denotes a contiguous group of IRQs, written for 0th IRQ.
*/
if (!irq_offset)
- write_msi_msg(irq, &msg);
+
pci_
write_msi_msg(irq, &msg);
setup_remapped_irq(irq, irq_cfg(irq), chip);
setup_remapped_irq(irq, irq_cfg(irq), chip);