diff options
Diffstat (limited to 'drivers/arm')
| -rw-r--r-- | drivers/arm/cci/cci.c | 23 | ||||
| -rw-r--r-- | drivers/arm/gic/v2/gicv2_main.c | 1 | ||||
| -rw-r--r-- | drivers/arm/gic/v3/gicv3_main.c | 1 |
3 files changed, 15 insertions, 10 deletions
diff --git a/drivers/arm/cci/cci.c b/drivers/arm/cci/cci.c index e15683840..81808b9f7 100644 --- a/drivers/arm/cci/cci.c +++ b/drivers/arm/cci/cci.c @@ -83,22 +83,25 @@ static unsigned int read_cci_part_number(uintptr_t base) */ static int get_slave_ports(unsigned int part_num) { - /* Macro to match CCI products */ -#define RET_ON_MATCH(product) \ - case CCI ## product ## _PART_NUM: \ - return CCI ## product ## _SLAVE_PORTS + int num_slave_ports = -1; switch (part_num) { - RET_ON_MATCH(400); - RET_ON_MATCH(500); - RET_ON_MATCH(550); - + case CCI400_PART_NUM: + num_slave_ports = CCI400_SLAVE_PORTS; + break; + case CCI500_PART_NUM: + num_slave_ports = CCI500_SLAVE_PORTS; + break; + case CCI550_PART_NUM: + num_slave_ports = CCI550_SLAVE_PORTS; + break; default: - return -1; + /* Do nothing in default case */ + break; } -#undef RET_ON_MATCH + return num_slave_ports; } #endif /* ENABLE_ASSERTIONS */ diff --git a/drivers/arm/gic/v2/gicv2_main.c b/drivers/arm/gic/v2/gicv2_main.c index 7e2c7a7b0..e25e501df 100644 --- a/drivers/arm/gic/v2/gicv2_main.c +++ b/drivers/arm/gic/v2/gicv2_main.c @@ -459,6 +459,7 @@ void gicv2_set_interrupt_type(unsigned int id, unsigned int type) break; default: assert(0); + break; } spin_unlock(&gic_lock); } diff --git a/drivers/arm/gic/v3/gicv3_main.c b/drivers/arm/gic/v3/gicv3_main.c index f4a3ef81f..d8fc7d683 100644 --- a/drivers/arm/gic/v3/gicv3_main.c +++ b/drivers/arm/gic/v3/gicv3_main.c @@ -1004,6 +1004,7 @@ void gicv3_set_interrupt_type(unsigned int id, unsigned int proc_num, break; default: assert(0); + break; } if (id < MIN_SPI_ID) { |