AX88772C_eeprom and ax8872c build together

hc

2024-05-16 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb

 kernel/drivers/clocksource/timer-integrator-ap.c
..
..
@@ -1,21 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * Integrator/AP timer driver
3
4
  * Copyright (C) 2000-2003 Deep Blue Solutions Ltd
4
5
  * Copyright (c) 2014, Linaro Limited
5
- *
6
- * This program is free software; you can redistribute it and/or modify
7
- * it under the terms of the GNU General Public License as published by
8
- * the Free Software Foundation; either version 2 of the License, or
9
- * (at your option) any later version.
10
- *
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
- * GNU General Public License for more details.
15
- *
16
- * You should have received a copy of the GNU General Public License
17
- * along with this program; if not, write to the Free Software
18
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
19
6
  */
20
7
 
21
8
 #include <linux/clk.h>
..
..
@@ -136,13 +123,6 @@
136
123
 	.rating			= 300,
137
124
 };
138
125
 
139
-static struct irqaction integrator_timer_irq = {
140
-	.name		= "timer",
141
-	.flags		= IRQF_TIMER | IRQF_IRQPOLL,
142
-	.handler	= integrator_timer_interrupt,
143
-	.dev_id		= &integrator_clockevent,
144
-};
145
-
146
126
 static int integrator_clockevent_init(unsigned long inrate,
147
127
 				      void __iomem *base, int irq)
148
128
 {
..
..
@@ -162,7 +142,9 @@
162
142
 	timer_reload = rate / HZ;
163
143
 	writel(ctrl, clkevt_base + TIMER_CTRL);
164
144
 
165
-	ret = setup_irq(irq, &integrator_timer_irq);
145
+	ret = request_irq(irq, integrator_timer_interrupt,
146
+			  IRQF_TIMER | IRQF_IRQPOLL, "timer",
147
+			  &integrator_clockevent);
166
148
 	if (ret)
167
149
 		return ret;
168
150
 
..
..
@@ -189,7 +171,7 @@
189
171
 
190
172
 	clk = of_clk_get(node, 0);
191
173
 	if (IS_ERR(clk)) {
192
-		pr_err("No clock for %s\n", node->name);
174
+		pr_err("No clock for %pOFn\n", node);
193
175
 		return PTR_ERR(clk);
194
176
 	}
195
177
 	clk_prepare_enable(clk);