Skip to content

Commit 7c8d141

Browse files
miguelafsilva5danielRep
authored andcommitted
fix(inline): Fix inline functions
Both MISRA and clang compiler force inline functions to be static. Functions that are used in multiple sources stop being inline because they cannot be static. The other inline functions become static and their prototype is removed from the header Signed-off-by: Miguel Silva <[email protected]>
1 parent 8e897c4 commit 7c8d141

File tree

8 files changed

+14
-18
lines changed

8 files changed

+14
-18
lines changed

src/arch/armv8/armv8-a/inc/arch/smmuv2.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -380,10 +380,6 @@ ssize_t smmu_alloc_sme(void);
380380
void smmu_write_ctxbnk(size_t ctx_id, paddr_t root_pt, asid_t vm_id);
381381
void smmu_write_sme(size_t sme, streamid_t mask, streamid_t id, bool group);
382382
void smmu_write_s2c(size_t sme, size_t ctx_id);
383-
size_t smmu_sme_get_ctx(size_t sme);
384-
streamid_t smmu_sme_get_id(size_t sme);
385-
streamid_t smmu_sme_get_mask(size_t sme);
386-
bool smmu_sme_is_group(size_t sme);
387383
bool smmu_compatible_sme_exists(streamid_t mask, streamid_t id, size_t ctx, bool group);
388384

389385
#endif

src/arch/armv8/armv8-a/iommu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ static bool iommu_vm_arch_add(struct vm* vm, streamid_t mask, streamid_t id)
6464
return true;
6565
}
6666

67-
inline bool iommu_arch_vm_add_device(struct vm* vm, streamid_t id)
67+
bool iommu_arch_vm_add_device(struct vm* vm, streamid_t id)
6868
{
6969
return iommu_vm_arch_add(vm, 0, id);
7070
}

src/arch/armv8/armv8-a/smmuv2.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,22 @@ struct smmu_priv smmu;
5252
/**
5353
* Accessors inline functions.
5454
*/
55-
inline bool smmu_sme_is_group(size_t sme)
55+
static inline bool smmu_sme_is_group(size_t sme)
5656
{
5757
return bitmap_get(smmu.grp_bitmap, sme);
5858
}
5959

60-
inline size_t smmu_sme_get_ctx(size_t sme)
60+
static inline size_t smmu_sme_get_ctx(size_t sme)
6161
{
6262
return S2CR_CBNDX(smmu.hw.glbl_rs0->S2CR[sme]);
6363
}
6464

65-
inline streamid_t smmu_sme_get_id(size_t sme)
65+
static inline streamid_t smmu_sme_get_id(size_t sme)
6666
{
6767
return SMMU_SMR_ID(smmu.hw.glbl_rs0->SMR[sme]);
6868
}
6969

70-
inline streamid_t smmu_sme_get_mask(size_t sme)
70+
static inline streamid_t smmu_sme_get_mask(size_t sme)
7171
{
7272
return SMMU_SMR_MASK(smmu.hw.glbl_rs0->SMR[sme]);
7373
}

src/arch/armv8/interrupts.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ bool interrupts_arch_check(irqid_t int_id)
4646
return gic_get_pend(int_id);
4747
}
4848

49-
inline bool interrupts_arch_conflict(bitmap_t* interrupt_bitmap, irqid_t int_id)
49+
bool interrupts_arch_conflict(bitmap_t* interrupt_bitmap, irqid_t int_id)
5050
{
5151
return (bitmap_get(interrupt_bitmap, int_id) && int_id > GIC_CPU_PRIV);
5252
}

src/arch/armv8/vgic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ extern volatile const size_t VGIC_IPI_ID;
4444
void vgic_ipi_handler(uint32_t event, uint64_t data);
4545
CPU_MSG_HANDLER(vgic_ipi_handler, VGIC_IPI_ID)
4646

47-
inline struct vgic_int* vgic_get_int(struct vcpu* vcpu, irqid_t int_id, vcpuid_t vgicr_id)
47+
struct vgic_int* vgic_get_int(struct vcpu* vcpu, irqid_t int_id, vcpuid_t vgicr_id)
4848
{
4949
if (int_id < GIC_CPU_PRIV) {
5050
struct vcpu* target_vcpu = vgicr_id == vcpu->id ? vcpu : vm_get_vcpu(vcpu->vm, vgicr_id);

src/arch/riscv/interrupts.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ void interrupts_arch_clear(irqid_t int_id)
119119
}
120120
}
121121

122-
inline bool interrupts_arch_conflict(bitmap_t* interrupt_bitmap, irqid_t int_id)
122+
bool interrupts_arch_conflict(bitmap_t* interrupt_bitmap, irqid_t int_id)
123123
{
124124
return bitmap_get(interrupt_bitmap, int_id);
125125
}

src/arch/riscv/iommu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ static bool iommu_vm_arch_add(struct vm* vm, deviceid_t dev_id)
427427
*
428428
* @returns true on success, false on error.
429429
*/
430-
inline bool iommu_arch_vm_add_device(struct vm* vm, deviceid_t dev_id)
430+
bool iommu_arch_vm_add_device(struct vm* vm, deviceid_t dev_id)
431431
{
432432
return iommu_vm_arch_add(vm, dev_id);
433433
}

src/core/interrupts.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,27 @@ spinlock_t irq_reserve_lock = SPINLOCK_INITVAL;
1616

1717
irq_handler_t interrupt_handlers[MAX_INTERRUPTS];
1818

19-
inline void interrupts_cpu_sendipi(cpuid_t target_cpu, irqid_t ipi_id)
19+
void interrupts_cpu_sendipi(cpuid_t target_cpu, irqid_t ipi_id)
2020
{
2121
interrupts_arch_ipi_send(target_cpu, ipi_id);
2222
}
2323

24-
inline void interrupts_cpu_enable(irqid_t int_id, bool en)
24+
void interrupts_cpu_enable(irqid_t int_id, bool en)
2525
{
2626
interrupts_arch_enable(int_id, en);
2727
}
2828

29-
inline bool interrupts_check(irqid_t int_id)
29+
bool interrupts_check(irqid_t int_id)
3030
{
3131
return interrupts_arch_check(int_id);
3232
}
3333

34-
inline void interrupts_clear(irqid_t int_id)
34+
void interrupts_clear(irqid_t int_id)
3535
{
3636
interrupts_arch_clear(int_id);
3737
}
3838

39-
inline void interrupts_init(void)
39+
void interrupts_init(void)
4040
{
4141
interrupts_arch_init();
4242

0 commit comments

Comments
 (0)