change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/drivers/rtc/rtc-wm8350.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  *	Real Time Clock driver for Wolfson Microelectronics WM8350
3
4
  *
..
..
@@ -5,12 +6,6 @@
5
6
  *
6
7
  *  Author: Liam Girdwood
7
8
  *          linux@wolfsonmicro.com
8
- *
9
- *  This program is free software; you can redistribute  it and/or modify it
10
- *  under  the terms of  the GNU General  Public License as published by the
11
- *  Free Software Foundation;  either version 2 of the  License, or (at your
12
- *  option) any later version.
13
- *
14
9
  */
15
10
 
16
11
 #include <linux/module.h>
..
..
@@ -340,8 +335,7 @@
340
335
 #ifdef CONFIG_PM_SLEEP
341
336
 static int wm8350_rtc_suspend(struct device *dev)
342
337
 {
343
-	struct platform_device *pdev = to_platform_device(dev);
344
-	struct wm8350 *wm8350 = dev_get_drvdata(&pdev->dev);
338
+	struct wm8350 *wm8350 = dev_get_drvdata(dev);
345
339
 	int ret = 0;
346
340
 	u16 reg;
347
341
 
..
..
@@ -351,8 +345,7 @@
351
345
 	    reg & WM8350_RTC_ALMSTS) {
352
346
 		ret = wm8350_rtc_stop_alarm(wm8350);
353
347
 		if (ret != 0)
354
-			dev_err(&pdev->dev, "Failed to stop RTC alarm: %d\n",
355
-				ret);
348
+			dev_err(dev, "Failed to stop RTC alarm: %d\n", ret);
356
349
 	}
357
350
 
358
351
 	return ret;
..
..
@@ -360,15 +353,13 @@
360
353
 
361
354
 static int wm8350_rtc_resume(struct device *dev)
362
355
 {
363
-	struct platform_device *pdev = to_platform_device(dev);
364
-	struct wm8350 *wm8350 = dev_get_drvdata(&pdev->dev);
356
+	struct wm8350 *wm8350 = dev_get_drvdata(dev);
365
357
 	int ret;
366
358
 
367
359
 	if (wm8350->rtc.alarm_enabled) {
368
360
 		ret = wm8350_rtc_start_alarm(wm8350);
369
361
 		if (ret != 0)
370
-			dev_err(&pdev->dev,
371
-				"Failed to restart RTC alarm: %d\n", ret);
362
+			dev_err(dev, "Failed to restart RTC alarm: %d\n", ret);
372
363
 	}
373
364
 
374
365
 	return 0;
..
..
@@ -441,14 +432,21 @@
441
432
 		return ret;
442
433
 	}
443
434
 
444
-	wm8350_register_irq(wm8350, WM8350_IRQ_RTC_SEC,
435
+	ret = wm8350_register_irq(wm8350, WM8350_IRQ_RTC_SEC,
445
436
 			    wm8350_rtc_update_handler, 0,
446
437
 			    "RTC Seconds", wm8350);
438
+	if (ret)
439
+		return ret;
440
+
447
441
 	wm8350_mask_irq(wm8350, WM8350_IRQ_RTC_SEC);
448
442
 
449
-	wm8350_register_irq(wm8350, WM8350_IRQ_RTC_ALM,
443
+	ret = wm8350_register_irq(wm8350, WM8350_IRQ_RTC_ALM,
450
444
 			    wm8350_rtc_alarm_handler, 0,
451
445
 			    "RTC Alarm", wm8350);
446
+	if (ret) {
447
+		wm8350_free_irq(wm8350, WM8350_IRQ_RTC_SEC, wm8350);
448
+		return ret;
449
+	}
452
450
 
453
451
 	return 0;
454
452
 }