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

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

genirq: Rename irq_data_get_msi() as irq_data_get_msi_desc() 



Rename irq_data_get_msi() as irq_data_get_msi_desc() to keep consistency
with other irq_data access helpers.

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 9fc0fd6b

drivers/pci/host/pcie-designware.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -326,7 +326,7 @@ static int dw_msi_setup_irq(struct msi_controller *chip, struct pci_dev *pdev, 
static void dw_msi_teardown_irq(struct msi_controller *chip, unsigned int irq)

static void dw_msi_teardown_irq(struct msi_controller *chip, unsigned int irq)

{

{

	struct irq_data *data = irq_get_irq_data(irq);

	struct irq_data *data = irq_get_irq_data(irq);

	struct msi_desc *msi = irq_data_get_msi(data);

	struct msi_desc *msi = irq_data_get_msi_desc(data);

	struct pcie_port *pp = sys_to_pcie(msi->dev->bus->sysdata);

	struct pcie_port *pp = sys_to_pcie(msi->dev->bus->sysdata);





	clear_irq_range(pp, irq, 1, data->hwirq);

	clear_irq_range(pp, irq, 1, data->hwirq);

drivers/pci/msi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -249,7 +249,7 @@ static void msix_mask_irq(struct msi_desc *desc, u32 flag) 




static void msi_set_mask_bit(struct irq_data *data, u32 flag)

static void msi_set_mask_bit(struct irq_data *data, u32 flag)

{

{

	struct msi_desc *desc = irq_data_get_msi(data);

	struct msi_desc *desc = irq_data_get_msi_desc(data);





	if (desc->msi_attrib.is_msix) {

	if (desc->msi_attrib.is_msix) {

		msix_mask_irq(desc, flag);

		msix_mask_irq(desc, flag);

include/linux/irq.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -638,7 +638,7 @@ static inline struct msi_desc *irq_get_msi_desc(unsigned int irq) 
	return d ? d->msi_desc : NULL;

	return d ? d->msi_desc : NULL;

}

}





static inline struct msi_desc *irq_data_get_msi(struct irq_data *d)

static inline struct msi_desc *irq_data_get_msi_desc(struct irq_data *d)

{

{

	return d->msi_desc;

	return d->msi_desc;

}

}