@@ -270,16 +270,11 @@ static int msi_domain_add_simple_msi_descs(struct device *dev, struct msi_ctrl *
270270 return ret ;
271271}
272272
273- void __get_cached_msi_msg (struct msi_desc * entry , struct msi_msg * msg )
274- {
275- * msg = entry -> msg ;
276- }
277-
278273void get_cached_msi_msg (unsigned int irq , struct msi_msg * msg )
279274{
280275 struct msi_desc * entry = irq_get_msi_desc (irq );
281276
282- __get_cached_msi_msg ( entry , msg ) ;
277+ * msg = entry -> msg ;
283278}
284279EXPORT_SYMBOL_GPL (get_cached_msi_msg );
285280
@@ -1352,49 +1347,28 @@ static int msi_domain_alloc_locked(struct device *dev, struct msi_ctrl *ctrl)
13521347}
13531348
13541349/**
1355- * msi_domain_alloc_irqs_range_locked - Allocate interrupts from a MSI interrupt domain
1350+ * msi_domain_alloc_irqs_range - Allocate interrupts from a MSI interrupt domain
13561351 * @dev: Pointer to device struct of the device for which the interrupts
13571352 * are allocated
13581353 * @domid: Id of the interrupt domain to operate on
13591354 * @first: First index to allocate (inclusive)
13601355 * @last: Last index to allocate (inclusive)
13611356 *
1362- * Must be invoked from within a msi_lock_descs() / msi_unlock_descs()
1363- * pair. Use this for MSI irqdomains which implement their own descriptor
1364- * allocation/free.
1365- *
13661357 * Return: %0 on success or an error code.
13671358 */
1368- int msi_domain_alloc_irqs_range_locked (struct device * dev , unsigned int domid ,
1369- unsigned int first , unsigned int last )
1359+ int msi_domain_alloc_irqs_range (struct device * dev , unsigned int domid ,
1360+ unsigned int first , unsigned int last )
13701361{
13711362 struct msi_ctrl ctrl = {
13721363 .domid = domid ,
13731364 .first = first ,
13741365 .last = last ,
13751366 .nirqs = last + 1 - first ,
13761367 };
1377-
1378- return msi_domain_alloc_locked (dev , & ctrl );
1379- }
1380-
1381- /**
1382- * msi_domain_alloc_irqs_range - Allocate interrupts from a MSI interrupt domain
1383- * @dev: Pointer to device struct of the device for which the interrupts
1384- * are allocated
1385- * @domid: Id of the interrupt domain to operate on
1386- * @first: First index to allocate (inclusive)
1387- * @last: Last index to allocate (inclusive)
1388- *
1389- * Return: %0 on success or an error code.
1390- */
1391- int msi_domain_alloc_irqs_range (struct device * dev , unsigned int domid ,
1392- unsigned int first , unsigned int last )
1393- {
13941368 int ret ;
13951369
13961370 msi_lock_descs (dev );
1397- ret = msi_domain_alloc_irqs_range_locked (dev , domid , first , last );
1371+ ret = msi_domain_alloc_locked (dev , & ctrl );
13981372 msi_unlock_descs (dev );
13991373 return ret ;
14001374}
@@ -1618,8 +1592,8 @@ static void msi_domain_free_locked(struct device *dev, struct msi_ctrl *ctrl)
16181592 * @first: First index to free (inclusive)
16191593 * @last: Last index to free (inclusive)
16201594 */
1621- void msi_domain_free_irqs_range_locked (struct device * dev , unsigned int domid ,
1622- unsigned int first , unsigned int last )
1595+ static void msi_domain_free_irqs_range_locked (struct device * dev , unsigned int domid ,
1596+ unsigned int first , unsigned int last )
16231597{
16241598 struct msi_ctrl ctrl = {
16251599 .domid = domid ,
0 commit comments