AX88772C_eeprom and ax8872c build together

hc

2024-05-16 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb

 kernel/arch/sh/drivers/dma/dma-pvr2.c
..
..
@@ -1,13 +1,10 @@
1
+// SPDX-License-Identifier: GPL-2.0
1
2
 /*
2
3
  * arch/sh/drivers/dma/dma-pvr2.c
3
4
  *
4
5
  * NEC PowerVR 2 (Dreamcast) DMA support
5
6
  *
6
7
  * Copyright (C) 2003, 2004  Paul Mundt
7
- *
8
- * This file is subject to the terms and conditions of the GNU General Public
9
- * License.  See the file "COPYING" in the main directory of this archive
10
- * for more details.
11
8
  */
12
9
 #include <linux/init.h>
13
10
 #include <linux/kernel.h>
..
..
@@ -67,11 +64,6 @@
67
64
 	return 0;
68
65
 }
69
66
 
70
-static struct irqaction pvr2_dma_irq = {
71
-	.name		= "pvr2 DMA handler",
72
-	.handler	= pvr2_dma_interrupt,
73
-};
74
-
75
67
 static struct dma_ops pvr2_dma_ops = {
76
68
 	.request	= pvr2_request_dma,
77
69
 	.get_residue	= pvr2_get_dma_residue,
..
..
@@ -87,7 +79,9 @@
87
79
 
88
80
 static int __init pvr2_dma_init(void)
89
81
 {
90
-	setup_irq(HW_EVENT_PVR2_DMA, &pvr2_dma_irq);
82
+	if (request_irq(HW_EVENT_PVR2_DMA, pvr2_dma_interrupt, 0,
83
+			"pvr2 DMA handler", NULL))
84
+		pr_err("Failed to register pvr2 DMA handler interrupt\n");
91
85
 	request_dma(PVR2_CASCADE_CHAN, "pvr2 cascade");
92
86
 
93
87
 	return register_dmac(&pvr2_dma_info);
..
..
@@ -105,4 +99,4 @@
105
99
 
106
100
 MODULE_AUTHOR("Paul Mundt <lethal@linux-sh.org>");
107
101
 MODULE_DESCRIPTION("NEC PowerVR 2 DMA driver");
108
-MODULE_LICENSE("GPL");
102
+MODULE_LICENSE("GPL v2");