Merge tag 'devicetree-for-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / kernel / irq / devres.c

diff --git a/kernel/irq/devres.c b/kernel/irq/devres.c
index 6a682c2..5d5378e 100644 (file)
--- a/kernel/irq/devres.c
+++ b/kernel/irq/devres.c
@@ -169,7 +169,7 @@ static void devm_irq_desc_release(struct device *dev, void *res)
  * @cnt:       Number of consecutive irqs to allocate
  * @node:      Preferred node on which the irq descriptor should be allocated
  * @owner:     Owning module (can be NULL)
- * @affinity:  Optional pointer to an affinity mask array of size @cnt
+ * @affinity:  Optional pointer to an irq_affinity_desc array of size @cnt
  *             which hints where the irq descriptors should be allocated
  *             and which default affinities to use
  *
@@ -179,7 +179,7 @@ static void devm_irq_desc_release(struct device *dev, void *res)
  */
 int __devm_irq_alloc_descs(struct device *dev, int irq, unsigned int from,
                           unsigned int cnt, int node, struct module *owner,
-                          const struct cpumask *affinity)
+                          const struct irq_affinity_desc *affinity)
 {
        struct irq_desc_devres *dr;
        int base;