renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 21:54:06 +08:00
Code

soc: ti: ti_sci_inta_msi: Use msi_desc::msi_index

Browse Source 
Use the common msi_index member and get rid of the pointless wrapper struct.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Acked-by: Nishanth Menon <nm@ti.com>
Link: https://lore.kernel.org/r/20211210221814.540704224@linutronix.de
This commit is contained in:
Thomas Gleixner 2021-12-10 23:19:17 +01:00
parent 78ee9fb4b8
commit 0f18095871
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/irqchip/irq-ti-sci-inta.c
View File

@ -595,7 +595,7 @@ static void ti_sci_inta_msi_set_desc(msi_alloc_info_t *arg,
struct platform_device *pdev = to_platform_device(desc->dev);
arg->desc = desc;
arg->hwirq = TO_HWIRQ(pdev->id, desc->inta.dev_index);
arg->hwirq = TO_HWIRQ(pdev->id, desc->msi_index);
}
static struct msi_domain_ops ti_sci_inta_msi_ops = {

6
drivers/soc/ti/ti_sci_inta_msi.c
View File

@ -84,7 +84,7 @@ static int ti_sci_inta_msi_alloc_descs(struct device *dev,
return -ENOMEM;
}
msi_desc->inta.dev_index = res->desc[set].start + i;
msi_desc->msi_index = res->desc[set].start + i;
INIT_LIST_HEAD(&msi_desc->list);
list_add_tail(&msi_desc->list, dev_to_msi_list(dev));
count++;
@ -96,7 +96,7 @@ static int ti_sci_inta_msi_alloc_descs(struct device *dev,
return -ENOMEM;
}
msi_desc->inta.dev_index = res->desc[set].start_sec + i;
msi_desc->msi_index = res->desc[set].start_sec + i;
INIT_LIST_HEAD(&msi_desc->list);
list_add_tail(&msi_desc->list, dev_to_msi_list(dev));
count++;
@ -154,7 +154,7 @@ unsigned int ti_sci_inta_msi_get_virq(struct device *dev, u32 dev_index)
struct msi_desc *desc;
for_each_msi_entry(desc, dev)
if (desc->inta.dev_index == dev_index)
if (desc->msi_index == dev_index)
return desc->irq;
return -ENODEV;

16
include/linux/msi.h
View File

@ -106,14 +106,6 @@ struct pci_msi_desc {
};
};
/**
* ti_sci_inta_msi_desc - TISCI based INTA specific msi descriptor data
* @dev_index: TISCI device index
*/
struct ti_sci_inta_msi_desc {
u16 dev_index;
};
/**
* struct msi_desc - Descriptor structure for MSI based interrupts
* @list: List head for management
@ -128,8 +120,7 @@ struct ti_sci_inta_msi_desc {
* @write_msi_msg_data: Data parameter for the callback.
*
* @msi_index: Index of the msi descriptor
* @pci: [PCI] PCI speficic msi descriptor data
* @inta: [INTA] TISCI based INTA specific msi descriptor data
* @pci: PCI specific msi descriptor data
*/
struct msi_desc {
/* Shared device/bus type independent data */
@ -147,10 +138,7 @@ struct msi_desc {
void *write_msi_msg_data;
u16 msi_index;
union {
struct pci_msi_desc pci;
struct ti_sci_inta_msi_desc inta;
};
struct pci_msi_desc pci;
};
/**