Skip to content

Commit 7bd2743

Browse files
Dr. David Alan Gilbertjonmason
authored andcommitted
NTB/msi: Remove unused functions
ntbm_msi_free_irq() and ntb_msi_peer_addr() were both added in 2019's commit 26b3a37 ("NTB: Introduce MSI library") but have remained unused. Remove them, and the ntbm_msi_callback_match() helper that was used by ntbm_msi_free_irq(). Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org> Signed-off-by: Jon Mason <jdmason@kudzu.us>
1 parent b1f4077 commit 7bd2743

2 files changed

Lines changed: 0 additions & 78 deletions

File tree

drivers/ntb/msi.c

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -315,37 +315,6 @@ int ntbm_msi_request_threaded_irq(struct ntb_dev *ntb, irq_handler_t handler,
315315
}
316316
EXPORT_SYMBOL(ntbm_msi_request_threaded_irq);
317317

318-
static int ntbm_msi_callback_match(struct device *dev, void *res, void *data)
319-
{
320-
struct ntb_dev *ntb = dev_ntb(dev);
321-
struct ntb_msi_devres *dr = res;
322-
323-
return dr->ntb == ntb && dr->entry == data;
324-
}
325-
326-
/**
327-
* ntbm_msi_free_irq() - free an interrupt
328-
* @ntb: NTB device context
329-
* @irq: Interrupt line to free
330-
* @dev_id: Device identity to free
331-
*
332-
* This function should be used to manually free IRQs allocated with
333-
* ntbm_request_[threaded_]irq().
334-
*/
335-
void ntbm_msi_free_irq(struct ntb_dev *ntb, unsigned int irq, void *dev_id)
336-
{
337-
struct msi_desc *entry = irq_get_msi_desc(irq);
338-
339-
entry->write_msi_msg = NULL;
340-
entry->write_msi_msg_data = NULL;
341-
342-
WARN_ON(devres_destroy(&ntb->dev, ntbm_msi_callback_release,
343-
ntbm_msi_callback_match, entry));
344-
345-
devm_free_irq(&ntb->dev, irq, dev_id);
346-
}
347-
EXPORT_SYMBOL(ntbm_msi_free_irq);
348-
349318
/**
350319
* ntb_msi_peer_trigger() - Trigger an interrupt handler on a peer
351320
* @ntb: NTB device context
@@ -373,36 +342,3 @@ int ntb_msi_peer_trigger(struct ntb_dev *ntb, int peer,
373342
return 0;
374343
}
375344
EXPORT_SYMBOL(ntb_msi_peer_trigger);
376-
377-
/**
378-
* ntb_msi_peer_addr() - Get the DMA address to trigger a peer's MSI interrupt
379-
* @ntb: NTB device context
380-
* @peer: Peer index
381-
* @desc: MSI descriptor data which triggers the interrupt
382-
* @msi_addr: Physical address to trigger the interrupt
383-
*
384-
* This function allows using DMA engines to trigger an interrupt
385-
* (for example, trigger an interrupt to process the data after
386-
* sending it). To trigger the interrupt, write @desc.data to the address
387-
* returned in @msi_addr
388-
*
389-
* Return: Zero on success, otherwise a negative error number.
390-
*/
391-
int ntb_msi_peer_addr(struct ntb_dev *ntb, int peer,
392-
struct ntb_msi_desc *desc,
393-
phys_addr_t *msi_addr)
394-
{
395-
int peer_widx = ntb_peer_mw_count(ntb) - 1 - peer;
396-
phys_addr_t mw_phys_addr;
397-
int ret;
398-
399-
ret = ntb_peer_mw_get_addr(ntb, peer_widx, &mw_phys_addr, NULL);
400-
if (ret)
401-
return ret;
402-
403-
if (msi_addr)
404-
*msi_addr = mw_phys_addr + desc->addr_offset;
405-
406-
return 0;
407-
}
408-
EXPORT_SYMBOL(ntb_msi_peer_addr);

include/linux/ntb.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1647,12 +1647,8 @@ int ntbm_msi_request_threaded_irq(struct ntb_dev *ntb, irq_handler_t handler,
16471647
irq_handler_t thread_fn,
16481648
const char *name, void *dev_id,
16491649
struct ntb_msi_desc *msi_desc);
1650-
void ntbm_msi_free_irq(struct ntb_dev *ntb, unsigned int irq, void *dev_id);
16511650
int ntb_msi_peer_trigger(struct ntb_dev *ntb, int peer,
16521651
struct ntb_msi_desc *desc);
1653-
int ntb_msi_peer_addr(struct ntb_dev *ntb, int peer,
1654-
struct ntb_msi_desc *desc,
1655-
phys_addr_t *msi_addr);
16561652

16571653
#else /* not CONFIG_NTB_MSI */
16581654

@@ -1674,21 +1670,11 @@ static inline int ntbm_msi_request_threaded_irq(struct ntb_dev *ntb,
16741670
{
16751671
return -EOPNOTSUPP;
16761672
}
1677-
static inline void ntbm_msi_free_irq(struct ntb_dev *ntb, unsigned int irq,
1678-
void *dev_id) {}
16791673
static inline int ntb_msi_peer_trigger(struct ntb_dev *ntb, int peer,
16801674
struct ntb_msi_desc *desc)
16811675
{
16821676
return -EOPNOTSUPP;
16831677
}
1684-
static inline int ntb_msi_peer_addr(struct ntb_dev *ntb, int peer,
1685-
struct ntb_msi_desc *desc,
1686-
phys_addr_t *msi_addr)
1687-
{
1688-
return -EOPNOTSUPP;
1689-
1690-
}
1691-
16921678
#endif /* CONFIG_NTB_MSI */
16931679

16941680
static inline int ntbm_msi_request_irq(struct ntb_dev *ntb,

0 commit comments

Comments
 (0)