Skip to content

Commit 9bdcc4d

Browse files
jasonbuxiaoxiang781216
jasonbu
authored and
xiaoxiang781216
committed
arch/irq.h: update all inline to inline_function
Inline & inline_function both used make confuze, let's modify all inline in irq.h to inline_function, also clear the always_inline_funcion declaration. Signed-off-by: buxiasen <[email protected]>
1 parent 1bc2e1a commit 9bdcc4d

File tree

35 files changed

+220
-257
lines changed

35 files changed

+220
-257
lines changed

‎arch/arm/include/arm/irq.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ extern volatile bool g_interrupt_context[CONFIG_SMP_NCPUS];
177177

178178
/* Save the current interrupt enable state & disable IRQs. */
179179

180-
static inline irqstate_t up_irq_save(void)
180+
static inline_function irqstate_t up_irq_save(void)
181181
{
182182
unsigned int flags;
183183
unsigned int temp;
@@ -194,7 +194,7 @@ static inline irqstate_t up_irq_save(void)
194194

195195
/* Restore saved IRQ & FIQ state */
196196

197-
static inline void up_irq_restore(irqstate_t flags)
197+
static inline_function void up_irq_restore(irqstate_t flags)
198198
{
199199
__asm__ __volatile__
200200
(
@@ -206,7 +206,7 @@ static inline void up_irq_restore(irqstate_t flags)
206206

207207
/* Enable IRQs and return the previous IRQ state */
208208

209-
static inline irqstate_t up_irq_enable(void)
209+
static inline_function irqstate_t up_irq_enable(void)
210210
{
211211
unsigned int flags;
212212
unsigned int temp;

‎arch/arm/include/armv6-m/irq.h

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,7 @@ struct xcptcontext
209209

210210
/* Get/set the PRIMASK register */
211211

212-
static inline uint8_t getprimask(void) always_inline_function;
213-
static inline uint8_t getprimask(void)
212+
static always_inline_function uint8_t getprimask(void)
214213
{
215214
uint32_t primask;
216215
__asm__ __volatile__
@@ -223,8 +222,7 @@ static inline uint8_t getprimask(void)
223222
return (uint8_t)primask;
224223
}
225224

226-
static inline void setprimask(uint32_t primask) always_inline_function;
227-
static inline void setprimask(uint32_t primask)
225+
static always_inline_function void setprimask(uint32_t primask)
228226
{
229227
__asm__ __volatile__
230228
(
@@ -236,16 +234,14 @@ static inline void setprimask(uint32_t primask)
236234

237235
/* Disable IRQs */
238236

239-
static inline void up_irq_disable(void) always_inline_function;
240-
static inline void up_irq_disable(void)
237+
static always_inline_function void up_irq_disable(void)
241238
{
242239
__asm__ __volatile__ ("\tcpsid i\n");
243240
}
244241

245242
/* Save the current primask state & disable IRQs */
246243

247-
static inline irqstate_t up_irq_save(void) always_inline_function;
248-
static inline irqstate_t up_irq_save(void)
244+
static always_inline_function irqstate_t up_irq_save(void)
249245
{
250246
unsigned short primask;
251247

@@ -266,16 +262,14 @@ static inline irqstate_t up_irq_save(void)
266262

267263
/* Enable IRQs */
268264

269-
static inline void up_irq_enable(void) always_inline_function;
270-
static inline void up_irq_enable(void)
265+
static always_inline_function void up_irq_enable(void)
271266
{
272267
__asm__ __volatile__ ("\tcpsie i\n");
273268
}
274269

275270
/* Restore saved primask state */
276271

277-
static inline void up_irq_restore(irqstate_t flags) always_inline_function;
278-
static inline void up_irq_restore(irqstate_t flags)
272+
static always_inline_function void up_irq_restore(irqstate_t flags)
279273
{
280274
/* If bit 0 of the primask is 0, then we need to restore
281275
* interrupts.
@@ -291,8 +285,7 @@ static inline void up_irq_restore(irqstate_t flags)
291285

292286
/* Get/set IPSR */
293287

294-
static inline uint32_t getipsr(void) always_inline_function;
295-
static inline uint32_t getipsr(void)
288+
static always_inline_function uint32_t getipsr(void)
296289
{
297290
uint32_t ipsr;
298291
__asm__ __volatile__
@@ -307,8 +300,7 @@ static inline uint32_t getipsr(void)
307300

308301
/* Get/set CONTROL */
309302

310-
static inline uint32_t getcontrol(void) always_inline_function;
311-
static inline uint32_t getcontrol(void)
303+
static always_inline_function uint32_t getcontrol(void)
312304
{
313305
uint32_t control;
314306
__asm__ __volatile__
@@ -321,8 +313,7 @@ static inline uint32_t getcontrol(void)
321313
return control;
322314
}
323315

324-
static inline void setcontrol(uint32_t control) always_inline_function;
325-
static inline void setcontrol(uint32_t control)
316+
static always_inline_function void setcontrol(uint32_t control)
326317
{
327318
__asm__ __volatile__
328319
(
@@ -344,7 +335,7 @@ static inline void setcontrol(uint32_t control)
344335
int up_cpu_index(void) noinstrument_function;
345336
#endif /* CONFIG_ARCH_HAVE_MULTICPU */
346337

347-
static inline_function uint32_t up_getsp(void)
338+
static always_inline_function uint32_t up_getsp(void)
348339
{
349340
register uint32_t sp;
350341

@@ -357,8 +348,7 @@ static inline_function uint32_t up_getsp(void)
357348
return sp;
358349
}
359350

360-
noinstrument_function
361-
static inline_function bool up_interrupt_context(void)
351+
static always_inline_function bool up_interrupt_context(void)
362352
{
363353
return getipsr() != 0;
364354
}

‎arch/arm/include/armv7-a/irq.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ struct xcptcontext
343343

344344
/* Return the current IRQ state */
345345

346-
static inline irqstate_t irqstate(void)
346+
static inline_function irqstate_t irqstate(void)
347347
{
348348
unsigned int cpsr;
349349

@@ -360,7 +360,7 @@ static inline irqstate_t irqstate(void)
360360

361361
/* Disable IRQs and return the previous IRQ state */
362362

363-
noinstrument_function static inline irqstate_t up_irq_save(void)
363+
noinstrument_function static inline_function irqstate_t up_irq_save(void)
364364
{
365365
unsigned int cpsr;
366366

@@ -382,7 +382,7 @@ noinstrument_function static inline irqstate_t up_irq_save(void)
382382

383383
/* Enable IRQs and return the previous IRQ state */
384384

385-
static inline irqstate_t up_irq_enable(void)
385+
static inline_function irqstate_t up_irq_enable(void)
386386
{
387387
unsigned int cpsr;
388388

@@ -406,7 +406,7 @@ static inline irqstate_t up_irq_enable(void)
406406

407407
/* Disable IRQs and return the previous IRQ state */
408408

409-
static inline irqstate_t up_irq_disable(void)
409+
static inline_function irqstate_t up_irq_disable(void)
410410
{
411411
unsigned int cpsr;
412412

@@ -424,7 +424,8 @@ static inline irqstate_t up_irq_disable(void)
424424

425425
/* Restore saved IRQ & FIQ state */
426426

427-
noinstrument_function static inline void up_irq_restore(irqstate_t flags)
427+
noinstrument_function static inline_function
428+
void up_irq_restore(irqstate_t flags)
428429
{
429430
__asm__ __volatile__
430431
(

‎arch/arm/include/armv7-m/irq.h

Lines changed: 18 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,7 @@ struct xcptcontext
267267

268268
/* Get/set the PRIMASK register */
269269

270-
static inline uint8_t getprimask(void) always_inline_function;
271-
static inline uint8_t getprimask(void)
270+
static always_inline_function uint8_t getprimask(void)
272271
{
273272
uint32_t primask;
274273
__asm__ __volatile__
@@ -281,8 +280,7 @@ static inline uint8_t getprimask(void)
281280
return (uint8_t)primask;
282281
}
283282

284-
static inline void setprimask(uint32_t primask) always_inline_function;
285-
static inline void setprimask(uint32_t primask)
283+
static always_inline_function void setprimask(uint32_t primask)
286284
{
287285
__asm__ __volatile__
288286
(
@@ -292,14 +290,12 @@ static inline void setprimask(uint32_t primask)
292290
: "memory");
293291
}
294292

295-
static inline void cpsie(void) always_inline_function;
296-
static inline void cpsie(void)
293+
static always_inline_function void cpsie(void)
297294
{
298295
__asm__ __volatile__ ("\tcpsie i\n");
299296
}
300297

301-
static inline void cpsid(void) always_inline_function;
302-
static inline void cpsid(void)
298+
static always_inline_function void cpsid(void)
303299
{
304300
__asm__ __volatile__ ("\tcpsid i\n");
305301
}
@@ -310,8 +306,7 @@ static inline void cpsid(void)
310306
* lower priority level as the BASEPRI value.
311307
*/
312308

313-
static inline uint8_t getbasepri(void) always_inline_function;
314-
static inline uint8_t getbasepri(void)
309+
static always_inline_function uint8_t getbasepri(void)
315310
{
316311
uint32_t basepri;
317312

@@ -325,8 +320,7 @@ static inline uint8_t getbasepri(void)
325320
return (uint8_t)basepri;
326321
}
327322

328-
static inline void setbasepri(uint32_t basepri) always_inline_function;
329-
static inline void setbasepri(uint32_t basepri)
323+
static always_inline_function void setbasepri(uint32_t basepri)
330324
{
331325
__asm__ __volatile__
332326
(
@@ -343,8 +337,7 @@ static inline void setbasepri(uint32_t basepri)
343337
* 837070 Workaround may be required if we are raising the priority.
344338
*/
345339

346-
static inline void raisebasepri(uint32_t basepri) always_inline_function;
347-
static inline void raisebasepri(uint32_t basepri)
340+
static always_inline_function void raisebasepri(uint32_t basepri)
348341
{
349342
register uint32_t primask;
350343

@@ -378,8 +371,7 @@ static inline void raisebasepri(uint32_t basepri)
378371

379372
/* Disable IRQs */
380373

381-
static inline void up_irq_disable(void) always_inline_function;
382-
static inline void up_irq_disable(void)
374+
static always_inline_function void up_irq_disable(void)
383375
{
384376
/* Probably raising priority */
385377

@@ -388,9 +380,7 @@ static inline void up_irq_disable(void)
388380

389381
/* Save the current primask state & disable IRQs */
390382

391-
static inline irqstate_t up_irq_save(void)
392-
always_inline_function noinstrument_function;
393-
static inline irqstate_t up_irq_save(void)
383+
static always_inline_function irqstate_t up_irq_save(void)
394384
{
395385
/* Probably raising priority */
396386

@@ -401,8 +391,7 @@ static inline irqstate_t up_irq_save(void)
401391

402392
/* Enable IRQs */
403393

404-
static inline void up_irq_enable(void) always_inline_function;
405-
static inline void up_irq_enable(void)
394+
static always_inline_function void up_irq_enable(void)
406395
{
407396
/* In this case, we are always retaining or lowering the priority value */
408397

@@ -412,9 +401,7 @@ static inline void up_irq_enable(void)
412401

413402
/* Restore saved primask state */
414403

415-
static inline void up_irq_restore(irqstate_t flags)
416-
always_inline_function noinstrument_function;
417-
static inline void up_irq_restore(irqstate_t flags)
404+
static always_inline_function void up_irq_restore(irqstate_t flags)
418405
{
419406
/* In this case, we are always retaining or lowering the priority value */
420407

@@ -423,8 +410,7 @@ static inline void up_irq_restore(irqstate_t flags)
423410

424411
/* Get/set IPSR */
425412

426-
static inline uint32_t getipsr(void) always_inline_function;
427-
static inline uint32_t getipsr(void)
413+
static always_inline_function uint32_t getipsr(void)
428414
{
429415
uint32_t ipsr;
430416
__asm__ __volatile__
@@ -439,8 +425,7 @@ static inline uint32_t getipsr(void)
439425

440426
/* Get/set FAULTMASK */
441427

442-
static inline uint32_t getfaultmask(void) always_inline_function;
443-
static inline uint32_t getfaultmask(void)
428+
static always_inline_function uint32_t getfaultmask(void)
444429
{
445430
uint32_t faultmask;
446431
__asm__ __volatile__
@@ -453,8 +438,7 @@ static inline uint32_t getfaultmask(void)
453438
return faultmask;
454439
}
455440

456-
static inline void setfaultmask(uint32_t faultmask) always_inline_function;
457-
static inline void setfaultmask(uint32_t faultmask)
441+
static always_inline_function void setfaultmask(uint32_t faultmask)
458442
{
459443
__asm__ __volatile__
460444
(
@@ -466,8 +450,7 @@ static inline void setfaultmask(uint32_t faultmask)
466450

467451
/* Get/set CONTROL */
468452

469-
static inline uint32_t getcontrol(void) always_inline_function;
470-
static inline uint32_t getcontrol(void)
453+
static always_inline_function uint32_t getcontrol(void)
471454
{
472455
uint32_t control;
473456
__asm__ __volatile__
@@ -480,8 +463,7 @@ static inline uint32_t getcontrol(void)
480463
return control;
481464
}
482465

483-
static inline void setcontrol(uint32_t control) always_inline_function;
484-
static inline void setcontrol(uint32_t control)
466+
static always_inline_function void setcontrol(uint32_t control)
485467
{
486468
__asm__ __volatile__
487469
(
@@ -503,7 +485,7 @@ static inline void setcontrol(uint32_t control)
503485
int up_cpu_index(void) noinstrument_function;
504486
#endif /* CONFIG_ARCH_HAVE_MULTICPU */
505487

506-
static inline_function uint32_t up_getsp(void)
488+
static always_inline_function uint32_t up_getsp(void)
507489
{
508490
register uint32_t sp;
509491

@@ -516,8 +498,7 @@ static inline_function uint32_t up_getsp(void)
516498
return sp;
517499
}
518500

519-
noinstrument_function
520-
static inline_function bool up_interrupt_context(void)
501+
static always_inline_function bool up_interrupt_context(void)
521502
{
522503
return getipsr() != 0;
523504
}

0 commit comments

Comments
 (0)