Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit ffba65ea247b · 2019-11-10T11:51:11.000-08:00
Pull irq fixlet from Thomas Gleixner:
 "A trivial fix for a kernel doc regression where an argument change was
  not reflected in the documentation"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irq/irqdomain: Update __irq_domain_alloc_fwnode() function documentation
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
@@ -51,7 +51,7 @@ EXPORT_SYMBOL_GPL(irqchip_fwnode_ops);
  * @type:	Type of irqchip_fwnode. See linux/irqdomain.h
  * @name:	Optional user provided domain name
  * @id:		Optional user provided id if name != NULL
- * @data:	Optional user-provided data
+ * @pa:		Optional user-provided physical address
  *
  * Allocate a struct irqchip_fwid, and return a poiner to the embedded
  * fwnode_handle (or NULL on failure).

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ EXPORT_SYMBOL_GPL(irqchip_fwnode_ops);`
`51`	`51`	`* @type: Type of irqchip_fwnode. See linux/irqdomain.h`
`52`	`52`	`* @name: Optional user provided domain name`
`53`	`53`	`* @id: Optional user provided id if name != NULL`
`54`		`- * @data: Optional user-provided data`
	`54`	`+ * @pa: Optional user-provided physical address`
`55`	`55`	`*`
`56`	`56`	`* Allocate a struct irqchip_fwid, and return a poiner to the embedded`
`57`	`57`	`* fwnode_handle (or NULL on failure).`