aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/msi.h
diff options
context:
space:
mode:
authorJiang Liu <jiang.liu@linux.intel.com>2014-11-09 23:10:33 +0800
committerThomas Gleixner <tglx@linutronix.de>2014-11-23 13:01:45 +0100
commit891d4a48f7da39de2be17a59b47df62dccf0f3d5 (patch)
tree4a02f67a8d065f8a9e271537d92df7e5edb6c98c /include/linux/msi.h
parentPCI/MSI: Kill redundant call of irq_set_msi_desc() for MSI-X interrupts (diff)
downloadlinux-dev-891d4a48f7da39de2be17a59b47df62dccf0f3d5.tar.xz
linux-dev-891d4a48f7da39de2be17a59b47df62dccf0f3d5.zip
PCI/MSI: Rename __read_msi_msg() to __pci_read_msi_msg()
Rename __read_msi_msg() to __pci_read_msi_msg() and kill unused read_msi_msg(). It's a preparation to separate generic MSI code from PCI core. Signed-off-by: Jiang 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: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux/msi.h')
-rw-r--r--include/linux/msi.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/msi.h b/include/linux/msi.h
index 6704991b0174..f36c37b46f10 100644
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -16,12 +16,11 @@ struct irq_data;
struct msi_desc;
void mask_msi_irq(struct irq_data *data);
void unmask_msi_irq(struct irq_data *data);
-void __read_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
void __get_cached_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
void __write_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
-void read_msi_msg(unsigned int irq, struct msi_msg *msg);
void get_cached_msi_msg(unsigned int irq, struct msi_msg *msg);
void write_msi_msg(unsigned int irq, struct msi_msg *msg);
+
u32 __msix_mask_irq(struct msi_desc *desc, u32 flag);
u32 __msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag);
@@ -51,6 +50,8 @@ struct msi_desc {
struct msi_msg msg;
};
+void __pci_read_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
+
/*
* The arch hooks to setup up msi irqs. Those functions are
* implemented as weak symbols so that they /can/ be overriden by