Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83a18912 authored by Jiang Liu's avatar Jiang Liu Committed by Thomas Gleixner
Browse files

PCI/MSI: Rename write_msi_msg() to pci_write_msi_msg() 



Rename write_msi_msg() to pci_write_msi_msg() to mark it as PCI
specific.

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Yingjoe Chen <yingjoe.chen@mediatek.com>
Cc: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 891d4a48

arch/arm/mach-iop13xx/msi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -153,7 +153,7 @@ int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc) 
	id = iop13xx_cpu_id();

	id = iop13xx_cpu_id();

	msg.data = (id << IOP13XX_MU_MIMR_CORE_SELECT) | (irq & 0x7f);

	msg.data = (id << IOP13XX_MU_MIMR_CORE_SELECT) | (irq & 0x7f);





	write_msi_msg(irq, &msg);

	pci_write_msi_msg(irq, &msg);

	irq_set_chip_and_handler(irq, &iop13xx_msi_chip, handle_simple_irq);

	irq_set_chip_and_handler(irq, &iop13xx_msi_chip, handle_simple_irq);





	return 0;

	return 0;

arch/ia64/kernel/msi_ia64.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ static int ia64_set_msi_irq_affinity(struct irq_data *idata, 
	data |= MSI_DATA_VECTOR(irq_to_vector(irq));

	data |= MSI_DATA_VECTOR(irq_to_vector(irq));

	msg.data = data;

	msg.data = data;





	write_msi_msg(irq, &msg);

	pci_write_msi_msg(irq, &msg);

	cpumask_copy(idata->affinity, cpumask_of(cpu));

	cpumask_copy(idata->affinity, cpumask_of(cpu));





	return 0;

	return 0;
@@ -71,7 +71,7 @@ int ia64_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc) 
		MSI_DATA_DELIVERY_FIXED |

		MSI_DATA_DELIVERY_FIXED |

		MSI_DATA_VECTOR(vector);

		MSI_DATA_VECTOR(vector);





	write_msi_msg(irq, &msg);

	pci_write_msi_msg(irq, &msg);

	irq_set_chip_and_handler(irq, &ia64_msi_chip, handle_edge_irq);

	irq_set_chip_and_handler(irq, &ia64_msi_chip, handle_edge_irq);





	return 0;

	return 0;

arch/ia64/sn/kernel/msi_sn.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -145,7 +145,7 @@ int sn_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *entry) 
	msg.data = 0x100 + irq;

	msg.data = 0x100 + irq;





	irq_set_msi_desc(irq, entry);

	irq_set_msi_desc(irq, entry);

	write_msi_msg(irq, &msg);

	pci_write_msi_msg(irq, &msg);

	irq_set_chip_and_handler(irq, &sn_msi_chip, handle_edge_irq);

	irq_set_chip_and_handler(irq, &sn_msi_chip, handle_edge_irq);





	return 0;

	return 0;
@@ -205,7 +205,7 @@ static int sn_set_msi_irq_affinity(struct irq_data *data, 
	msg.address_hi = (u32)(bus_addr >> 32);

	msg.address_hi = (u32)(bus_addr >> 32);

	msg.address_lo = (u32)(bus_addr & 0x00000000ffffffff);

	msg.address_lo = (u32)(bus_addr & 0x00000000ffffffff);





	write_msi_msg(irq, &msg);

	pci_write_msi_msg(irq, &msg);

	cpumask_copy(data->affinity, cpu_mask);

	cpumask_copy(data->affinity, cpu_mask);





	return 0;

	return 0;

arch/mips/pci/msi-octeon.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -178,7 +178,7 @@ int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) 
	pci_write_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, control);

	pci_write_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, control);





	irq_set_msi_desc(irq, desc);

	irq_set_msi_desc(irq, desc);

	write_msi_msg(irq, &msg);

	pci_write_msi_msg(irq, &msg);

	return 0;

	return 0;

}

}

arch/mips/pci/msi-xlp.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -345,7 +345,7 @@ static int xlp_setup_msi(uint64_t lnkbase, int node, int link, 
	if (ret < 0)

	if (ret < 0)

		return ret;

		return ret;





	write_msi_msg(xirq, &msg);

	pci_write_msi_msg(xirq, &msg);

	return 0;

	return 0;

}

}
@@ -448,7 +448,7 @@ static int xlp_setup_msix(uint64_t lnkbase, int node, int link, 
		return ret;

		return ret;

	}

	}





	write_msi_msg(xirq, &msg);

	pci_write_msi_msg(xirq, &msg);

	return 0;

	return 0;

}

}