update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/powerpc/platforms/83xx/mpc832x_rdb.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * arch/powerpc/platforms/83xx/mpc832x_rdb.c
3
4
  *
..
..
@@ -7,11 +8,6 @@
7
8
  * MPC832x RDB board specific routines.
8
9
  * This file is based on mpc832x_mds.c and mpc8313_rdb.c
9
10
  * Author: Michael Barkowski <michael.barkowski@freescale.com>
10
- *
11
- * This program is free software; you can redistribute  it and/or modify it
12
- * under  the terms of  the GNU General  Public License as published by the
13
- * Free Software Foundation;  either version 2 of the  License, or (at your
14
- * option) any later version.
15
11
  */
16
12
 
17
13
 #include <linux/pci.h>
..
..
@@ -26,7 +22,6 @@
26
22
 #include <asm/ipic.h>
27
23
 #include <asm/udbg.h>
28
24
 #include <soc/fsl/qe/qe.h>
29
-#include <soc/fsl/qe/qe_ic.h>
30
25
 #include <sysdev/fsl_soc.h>
31
26
 #include <sysdev/fsl_pci.h>
32
27
 
..
..
@@ -111,7 +106,7 @@
111
106
 
112
107
 		goto next;
113
108
 unreg:
114
-		platform_device_del(pdev);
109
+		platform_device_put(pdev);
115
110
 err:
116
111
 		pr_err("%pOF: registration failed\n", np);
117
112
 next:
..
..
@@ -224,7 +219,7 @@
224
219
 	.name		= "MPC832x RDB",
225
220
 	.probe		= mpc832x_rdb_probe,
226
221
 	.setup_arch	= mpc832x_rdb_setup_arch,
227
-	.init_IRQ	= mpc83xx_ipic_and_qe_init_IRQ,
222
+	.init_IRQ	= mpc83xx_ipic_init_IRQ,
228
223
 	.get_irq	= ipic_get_irq,
229
224
 	.restart	= mpc83xx_restart,
230
225
 	.time_init	= mpc83xx_time_init,