tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

NTB/msi: Remove unused functions

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 <linux@treblig.org>
Signed-off-by: Jon Mason <jdmason@kudzu.us>

authored by

Dr. David Alan Gilbert and committed by
Jon Mason 7bd27439 b1f40774

-78
-64
drivers/ntb/msi.c
··· 315 315 } 316 316 EXPORT_SYMBOL(ntbm_msi_request_threaded_irq); 317 317 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 - 349 318 /** 350 319 * ntb_msi_peer_trigger() - Trigger an interrupt handler on a peer 351 320 * @ntb: NTB device context ··· 342 373 return 0; 343 374 } 344 375 EXPORT_SYMBOL(ntb_msi_peer_trigger); 345 - 346 - /** 347 - * ntb_msi_peer_addr() - Get the DMA address to trigger a peer's MSI interrupt 348 - * @ntb: NTB device context 349 - * @peer: Peer index 350 - * @desc: MSI descriptor data which triggers the interrupt 351 - * @msi_addr: Physical address to trigger the interrupt 352 - * 353 - * This function allows using DMA engines to trigger an interrupt 354 - * (for example, trigger an interrupt to process the data after 355 - * sending it). To trigger the interrupt, write @desc.data to the address 356 - * returned in @msi_addr 357 - * 358 - * Return: Zero on success, otherwise a negative error number. 359 - */ 360 - int ntb_msi_peer_addr(struct ntb_dev *ntb, int peer, 361 - struct ntb_msi_desc *desc, 362 - phys_addr_t *msi_addr) 363 - { 364 - int peer_widx = ntb_peer_mw_count(ntb) - 1 - peer; 365 - phys_addr_t mw_phys_addr; 366 - int ret; 367 - 368 - ret = ntb_peer_mw_get_addr(ntb, peer_widx, &mw_phys_addr, NULL); 369 - if (ret) 370 - return ret; 371 - 372 - if (msi_addr) 373 - *msi_addr = mw_phys_addr + desc->addr_offset; 374 - 375 - return 0; 376 - } 377 - EXPORT_SYMBOL(ntb_msi_peer_addr);
-14
include/linux/ntb.h
··· 1647 1647 irq_handler_t thread_fn, 1648 1648 const char *name, void *dev_id, 1649 1649 struct ntb_msi_desc *msi_desc); 1650 - void ntbm_msi_free_irq(struct ntb_dev *ntb, unsigned int irq, void *dev_id); 1651 1650 int ntb_msi_peer_trigger(struct ntb_dev *ntb, int peer, 1652 1651 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); 1656 1652 1657 1653 #else /* not CONFIG_NTB_MSI */ 1658 1654 ··· 1670 1674 { 1671 1675 return -EOPNOTSUPP; 1672 1676 } 1673 - static inline void ntbm_msi_free_irq(struct ntb_dev *ntb, unsigned int irq, 1674 - void *dev_id) {} 1675 1677 static inline int ntb_msi_peer_trigger(struct ntb_dev *ntb, int peer, 1676 1678 struct ntb_msi_desc *desc) 1677 1679 { 1678 1680 return -EOPNOTSUPP; 1679 1681 } 1680 - static inline int ntb_msi_peer_addr(struct ntb_dev *ntb, int peer, 1681 - struct ntb_msi_desc *desc, 1682 - phys_addr_t *msi_addr) 1683 - { 1684 - return -EOPNOTSUPP; 1685 - 1686 - } 1687 - 1688 1682 #endif /* CONFIG_NTB_MSI */ 1689 1683 1690 1684 static inline int ntbm_msi_request_irq(struct ntb_dev *ntb,