NTB/msi: Remove unused functions
PATCH 1/1 NTB/msi: Remove unused functions
From: "Dr. David Alan Gilbert" <[email protected]>
ntbm_msi_free_irq() and ntb_msi_peer_addr() were both added in 2019's commit 26b3a37b9284 ("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 <[email protected]>
--- drivers/ntb/msi.c | 64 --------------------------------------------- include/linux/ntb.h | 14 ---------- 2 files changed, 78 deletions(-)
drivers/ntb/msi.c +0 -64
@@ -321,37 +321,6 @@ int ntbm_msi_request_threaded_irq(struct ntb_dev *ntb, irq_handler_t handler, }EXPORT_SYMBOL (ntbm_msi_request_threaded_irq); -static int ntbm_msi_callback_match (struct device *dev,void *res,void *data) -{ -struct ntb_dev *ntb =dev_ntb (dev); -struct ntb_msi_devres *dr = res; - -return dr->ntb == ntb && dr->entry == data; -} - -/** -* ntbm_msi_free_irq() - free an interrupt -* @ntb: NTB device context -* @irq: Interrupt line to free -* @dev_id: Device identity to free -* -* This function should be used to manually free IRQs allocated with -* ntbm_request_[threaded_]irq(). -*/ -void ntbm_msi_free_irq (struct ntb_dev *ntb,unsigned int irq,void *dev_id) -{ -struct msi_desc *entry =irq_get_msi_desc (irq); - - entry->write_msi_msg =NULL ; - entry->write_msi_msg_data =NULL ; - -WARN_ON (devres_destroy (&ntb->dev, ntbm_msi_callback_release, - ntbm_msi_callback_match, entry)); - -devm_free_irq (&ntb->dev, irq, dev_id); -} -EXPORT_SYMBOL (ntbm_msi_free_irq); -/** * ntb_msi_peer_trigger() - Trigger an interrupt handler on a peer * @ntb: NTB device context
@@ -379,36 +348,3 @@ int ntb_msi_peer_trigger(struct ntb_dev *ntb, int peer,return 0 ; }EXPORT_SYMBOL (ntb_msi_peer_trigger); - -/** -* ntb_msi_peer_addr() - Get the DMA address to trigger a peer's MSI interrupt -* @ntb: NTB device context -* @peer: Peer index -* @desc: MSI descriptor data which triggers the interrupt -* @msi_addr: Physical address to trigger the interrupt -* -* This function allows using DMA engines to trigger an interrupt -* (for example, trigger an interrupt to process the data after -* sending it). To trigger the interrupt, write @desc.data to the address -* returned in @msi_addr -* -* Return: Zero on success, otherwise a negative error number. -*/ -int ntb_msi_peer_addr (struct ntb_dev *ntb,int peer, -struct ntb_msi_desc *desc, -phys_addr_t *msi_addr) -{ -int peer_widx =ntb_peer_mw_count (ntb) -1 - peer; -phys_addr_t mw_phys_addr; -int ret; - - ret =ntb_peer_mw_get_addr (ntb, peer_widx, &mw_phys_addr,NULL ); -if (ret) -return ret; - -if (msi_addr) - *msi_addr = mw_phys_addr + desc->addr_offset; - -return 0 ; -} -EXPORT_SYMBOL (ntb_msi_peer_addr);
include/linux/ntb.h +0 -14
@@ -1647,12 +1647,8 @@ int ntbm_msi_request_threaded_irq(struct ntb_dev *ntb, irq_handler_t handler,irq_handler_t thread_fn, const char *name, void *dev_id, struct ntb_msi_desc *msi_desc); -void ntbm_msi_free_irq (struct ntb_dev *ntb,unsigned int irq,void *dev_id);int ntb_msi_peer_trigger (struct ntb_dev *ntb,int peer,struct ntb_msi_desc *desc); -int ntb_msi_peer_addr (struct ntb_dev *ntb,int peer, -struct ntb_msi_desc *desc, -phys_addr_t *msi_addr);#else /* not CONFIG_NTB_MSI */
@@ -1674,21 +1670,11 @@ static inline int ntbm_msi_request_threaded_irq(struct ntb_dev *ntb, {return -EOPNOTSUPP ; } -static inline void ntbm_msi_free_irq (struct ntb_dev *ntb,unsigned int irq, -void *dev_id) {}static inline int ntb_msi_peer_trigger (struct ntb_dev *ntb,int peer,struct ntb_msi_desc *desc) {return -EOPNOTSUPP ; } -static inline int ntb_msi_peer_addr (struct ntb_dev *ntb,int peer, -struct ntb_msi_desc *desc, -phys_addr_t *msi_addr) -{ -return -EOPNOTSUPP ; - -} -#endif /* CONFIG_NTB_MSI */ static inline int ntbm_msi_request_irq(struct ntb_dev *ntb,
Signature · 1 line
2.48.1