diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-17 08:14:18 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-17 08:14:18 +0200 |
| commit | 96000bc956628dc0cc608696d5385ffc19e65a76 (patch) | |
| tree | 0bb9bcfeda9689dfdb902746851a98859cf4c9a1 /drivers/ntb/msi.c | |
| parent | Merge tag 'linux-watchdog-5.17-rc1' of git://www.linux-watchdog.org/linux-watchdog (diff) | |
| parent | ntb_hw_switchtec: Fix a minor issue in config_req_id_table() (diff) | |
| download | wireguard-linux-96000bc956628dc0cc608696d5385ffc19e65a76.tar.xz wireguard-linux-96000bc956628dc0cc608696d5385ffc19e65a76.zip | |
Merge tag 'ntb-5.17' of git://github.com/jonmason/ntb
Pull NTB updates from Jon Mason:
"New AMD PCI ID for NTB, and a number of bug fixes for ntb_hw_switchtec
for Linux v5.17"
* tag 'ntb-5.17' of git://github.com/jonmason/ntb:
ntb_hw_switchtec: Fix a minor issue in config_req_id_table()
ntb_hw_switchtec: Remove code for disabling ID protection
ntb_hw_switchtec: Update the way of getting VEP instance ID
ntb_hw_switchtec: AND with the part_map for a valid tpart_vec
ntb_hw_switchtec: Fix bug with more than 32 partitions
ntb_hw_switchtec: Fix pff ioread to read into mmio_part_cfg_all
ntb_hw_switchtec: fix the spelling of "its"
NTB/msi: Fix ntbm_msi_request_threaded_irq() kernel-doc comment
ntb_hw_amd: Add NTB PCI ID for new gen CPU
Diffstat (limited to 'drivers/ntb/msi.c')
| -rw-r--r-- | drivers/ntb/msi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ntb/msi.c b/drivers/ntb/msi.c index 2818bfcf4031..dd683cb58d09 100644 --- a/drivers/ntb/msi.c +++ b/drivers/ntb/msi.c @@ -262,8 +262,9 @@ static int ntbm_msi_setup_callback(struct ntb_dev *ntb, struct msi_desc *entry, * @handler: Function to be called when the IRQ occurs * @thread_fn: Function to be called in a threaded interrupt context. NULL * for clients which handle everything in @handler - * @devname: An ascii name for the claiming device, dev_name(dev) if NULL + * @name: An ascii name for the claiming device, dev_name(dev) if NULL * @dev_id: A cookie passed back to the handler function + * @msi_desc: MSI descriptor data which triggers the interrupt * * This function assigns an interrupt handler to an unused * MSI interrupt and returns the descriptor used to trigger |