summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2016-01-20 11:48:25 -0600
committerBjorn Helgaas <bhelgaas@google.com>2016-01-20 11:48:25 -0600
commit9662e32c810ad3e6ce49832d5f585a54f8fbdbdb (patch)
treefd9fd3f8cd44e231b8dc71c2e360eb19963972d5 /include
parent904f664b585cc9f3dc134a8c0dd08e9bce6c10bc (diff)
parentbd7900825a3db4c4916fafb400c1f669120039d2 (diff)
downloadlinux-9662e32c810ad3e6ce49832d5f585a54f8fbdbdb.tar.bz2
Merge branch 'pci/trivial' into next
* pci/trivial: PCI: shpchp: Constify hpc_ops structure PCI: Use kobj_to_dev() instead of open-coding it PCI: Use to_pci_dev() instead of open-coding it PCI: Fix all whitespace issues PCI/MSI: Fix typos in <linux/msi.h>
Diffstat (limited to 'include')
-rw-r--r--include/linux/msi.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/msi.h b/include/linux/msi.h
index f71a25e5fd25..8974b2177b67 100644
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -186,7 +186,7 @@ struct msi_domain_info;
* @msi_free: Domain specific function to free a MSI interrupts
* @msi_check: Callback for verification of the domain/info/dev data
* @msi_prepare: Prepare the allocation of the interrupts in the domain
- * @msi_finish: Optional callbacl to finalize the allocation
+ * @msi_finish: Optional callback to finalize the allocation
* @set_desc: Set the msi descriptor for an interrupt
* @handle_error: Optional error handler if the allocation fails
*
@@ -194,7 +194,7 @@ struct msi_domain_info;
* msi_create_irq_domain() and related interfaces
*
* @msi_check, @msi_prepare, @msi_finish, @set_desc and @handle_error
- * are callbacks used by msi_irq_domain_alloc_irqs() and related
+ * are callbacks used by msi_domain_alloc_irqs() and related
* interfaces which are based on msi_desc.
*/
struct msi_domain_ops {