mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/clocksource/samsung_pwm_timer.c
..
..
@@ -1,12 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * Copyright (c) 2011 Samsung Electronics Co., Ltd.
3
4
  *		http://www.samsung.com/
4
5
  *
5
6
  * samsung - Common hr-timer support (s3c and s5p)
6
- *
7
- * This program is free software; you can redistribute it and/or modify
8
- * it under the terms of the GNU General Public License version 2 as
9
- * published by the Free Software Foundation.
10
7
 */
11
8
 
12
9
 #include <linux/interrupt.h>
..
..
@@ -259,13 +256,6 @@
259
256
 	return IRQ_HANDLED;
260
257
 }
261
258
 
262
-static struct irqaction samsung_clock_event_irq = {
263
-	.name		= "samsung_time_irq",
264
-	.flags		= IRQF_TIMER | IRQF_IRQPOLL,
265
-	.handler	= samsung_clock_event_isr,
266
-	.dev_id		= &time_event_device,
267
-};
268
-
269
259
 static void __init samsung_clockevent_init(void)
270
260
 {
271
261
 	unsigned long pclk;
..
..
@@ -285,7 +275,10 @@
285
275
 						clock_rate, 1, pwm.tcnt_max);
286
276
 
287
277
 	irq_number = pwm.irq[pwm.event_id];
288
-	setup_irq(irq_number, &samsung_clock_event_irq);
278
+	if (request_irq(irq_number, samsung_clock_event_isr,
279
+			IRQF_TIMER | IRQF_IRQPOLL, "samsung_time_irq",
280
+			&time_event_device))
281
+		pr_err("%s: request_irq() failed\n", "samsung_time_irq");
289
282
 
290
283
 	if (pwm.variant.has_tint_cstat) {
291
284
 		u32 mask = (1 << pwm.event_id);
..
..
@@ -433,8 +426,7 @@
433
426
 
434
427
 	of_property_for_each_u32(np, "samsung,pwm-outputs", prop, cur, val) {
435
428
 		if (val >= SAMSUNG_PWM_NUM) {
436
-			pr_warning("%s: invalid channel index in samsung,pwm-outputs property\n",
437
-								__func__);
429
+			pr_warn("%s: invalid channel index in samsung,pwm-outputs property\n", __func__);
438
430
 			continue;
439
431
 		}
440
432
 		pwm.variant.output_mask |= 1 << val;