Commit 78ee9fb4 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

bus: fsl-mc-msi: Use msi_desc::msi_index 



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

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20211210221814.477386185@linutronix.de
parent dba27c7f

drivers/bus/fsl-mc/fsl-mc-allocator.c

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ int fsl_mc_populate_irq_pool(struct fsl_mc_device *mc_bus_dev, 
	}



	for_each_msi_entry(msi_desc, &mc_bus_dev->dev) {

		mc_dev_irq = &irq_resources[msi_desc->fsl_mc.msi_index];

		mc_dev_irq = &irq_resources[msi_desc->msi_index];

		mc_dev_irq->msi_desc = msi_desc;

		mc_dev_irq->resource.id = msi_desc->irq;

	}

drivers/bus/fsl-mc/fsl-mc-msi.c

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static irq_hw_number_t fsl_mc_domain_calc_hwirq(struct fsl_mc_device *dev, 
	 * Make the base hwirq value for ICID*10000 so it is readable

	 * as a decimal value in /proc/interrupts.

	 */

	return (irq_hw_number_t)(desc->fsl_mc.msi_index + (dev->icid * 10000));

	return (irq_hw_number_t)(desc->msi_index + (dev->icid * 10000));

}



static void fsl_mc_msi_set_desc(msi_alloc_info_t *arg,
@@ -122,7 +122,7 @@ static void fsl_mc_msi_write_msg(struct irq_data *irq_data, 
	struct fsl_mc_device *mc_bus_dev = to_fsl_mc_device(msi_desc->dev);

	struct fsl_mc_bus *mc_bus = to_fsl_mc_bus(mc_bus_dev);

	struct fsl_mc_device_irq *mc_dev_irq =

		&mc_bus->irq_resources[msi_desc->fsl_mc.msi_index];

		&mc_bus->irq_resources[msi_desc->msi_index];



	msi_desc->msg = *msg;
@@ -235,7 +235,7 @@ static int fsl_mc_msi_alloc_descs(struct device *dev, unsigned int irq_count) 
			goto cleanup_msi_descs;

		}



		msi_desc->fsl_mc.msi_index = i;

		msi_desc->msi_index = i;

		INIT_LIST_HEAD(&msi_desc->list);

		list_add_tail(&msi_desc->list, dev_to_msi_list(dev));

	}

include/linux/msi.h

+0 −10
Original line number Diff line number Diff line
@@ -106,14 +106,6 @@ struct pci_msi_desc { 
	};

};



/**

 * fsl_mc_msi_desc - FSL-MC device specific msi descriptor data

 * @msi_index:		The index of the MSI descriptor

 */

struct fsl_mc_msi_desc {

	u16				msi_index;

};



/**

 * ti_sci_inta_msi_desc - TISCI based INTA specific msi descriptor data

 * @dev_index: TISCI device index
@@ -137,7 +129,6 @@ struct ti_sci_inta_msi_desc { 
 *

 * @msi_index:	Index of the msi descriptor

 * @pci:	[PCI]	    PCI speficic msi descriptor data

 * @fsl_mc:	[fsl-mc]    FSL MC device specific msi descriptor data

 * @inta:	[INTA]	    TISCI based INTA specific msi descriptor data

 */

struct msi_desc {
@@ -158,7 +149,6 @@ struct msi_desc { 
	u16				msi_index;

	union {

		struct pci_msi_desc		pci;

		struct fsl_mc_msi_desc		fsl_mc;

		struct ti_sci_inta_msi_desc	inta;

	};

};