移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/kernel/irq/devres.c
..
..
@@ -84,8 +84,6 @@
84
84
  *	@dev: device to request interrupt for
85
85
  *	@irq: Interrupt line to allocate
86
86
  *	@handler: Function to be called when the IRQ occurs
87
- *	@thread_fn: function to be called in a threaded interrupt context. NULL
88
- *		    for devices which handle everything in @handler
89
87
  *	@irqflags: Interrupt type flags
90
88
  *	@devname: An ascii name for the claiming device, dev_name(dev) if NULL
91
89
  *	@dev_id: A cookie passed back to the handler function
..
..
@@ -169,7 +167,7 @@
169
167
  * @cnt:	Number of consecutive irqs to allocate
170
168
  * @node:	Preferred node on which the irq descriptor should be allocated
171
169
  * @owner:	Owning module (can be NULL)
172
- * @affinity:	Optional pointer to an affinity mask array of size @cnt
170
+ * @affinity:	Optional pointer to an irq_affinity_desc array of size @cnt
173
171
  *		which hints where the irq descriptors should be allocated
174
172
  *		and which default affinities to use
175
173
  *
..
..
@@ -179,7 +177,7 @@
179
177
  */
180
178
 int __devm_irq_alloc_descs(struct device *dev, int irq, unsigned int from,
181
179
 			   unsigned int cnt, int node, struct module *owner,
182
-			   const struct cpumask *affinity)
180
+			   const struct irq_affinity_desc *affinity)
183
181
 {
184
182
 	struct irq_desc_devres *dr;
185
183
 	int base;
..
..
@@ -222,9 +220,8 @@
222
220
 			    irq_flow_handler_t handler)
223
221
 {
224
222
 	struct irq_chip_generic *gc;
225
-	unsigned long sz = sizeof(*gc) + num_ct * sizeof(struct irq_chip_type);
226
223
 
227
-	gc = devm_kzalloc(dev, sz, GFP_KERNEL);
224
+	gc = devm_kzalloc(dev, struct_size(gc, chip_types, num_ct), GFP_KERNEL);
228
225
 	if (gc)
229
226
 		irq_init_generic_chip(gc, name, num_ct,
230
227
 				      irq_base, reg_base, handler);