drivers: rv32m1: remove bogus IRQ_PRI related defines

The defines related to IRQ priority don't exist and aren't used. So just pass 0 to IRQ_CONNECT for the priority field. Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
zephyrproject-rtos · Jun 24, 2019 · f20d2b6 · f20d2b6
1 parent 59786b4
commit f20d2b6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/drivers/gpio/gpio_rv32m1.c b/drivers/gpio/gpio_rv32m1.c
@@ -296,7 +296,7 @@ static int gpio_rv32m1_porta_init(struct device *dev)
 {
 #ifdef DT_OPENISA_RV32M1_GPIO_GPIO_A_IRQ_0
 	IRQ_CONNECT(DT_OPENISA_RV32M1_GPIO_GPIO_A_IRQ_0,
-		    DT_OPENISA_RV32M1_GPIO_GPIO_A_IRQ_0_PRIORITY,
+		    0,
 		    gpio_rv32m1_port_isr, DEVICE_GET(gpio_rv32m1_porta), 0);
 
 	irq_enable(DT_OPENISA_RV32M1_GPIO_GPIO_A_IRQ_0);
@@ -341,7 +341,7 @@ static int gpio_rv32m1_portb_init(struct device *dev)
 {
 #ifdef DT_OPENISA_RV32M1_GPIO_GPIO_B_IRQ_0
 	IRQ_CONNECT(DT_OPENISA_RV32M1_GPIO_GPIO_B_IRQ_0,
-		    DT_OPENISA_RV32M1_GPIO_GPIO_B_IRQ_0_PRIORITY,
+		    0,
 		    gpio_rv32m1_port_isr, DEVICE_GET(gpio_rv32m1_portb), 0);
 
 	irq_enable(DT_OPENISA_RV32M1_GPIO_GPIO_B_IRQ_0);
@@ -387,7 +387,7 @@ static int gpio_rv32m1_portc_init(struct device *dev)
 {
 #ifdef DT_OPENISA_RV32M1_GPIO_GPIO_C_IRQ_0
 	IRQ_CONNECT(DT_OPENISA_RV32M1_GPIO_GPIO_C_IRQ_0,
-		    DT_OPENISA_RV32M1_GPIO_GPIO_C_IRQ_0_PRIORITY,
+		    0,
 		    gpio_rv32m1_port_isr, DEVICE_GET(gpio_rv32m1_portc), 0);
 
 	irq_enable(DT_OPENISA_RV32M1_GPIO_GPIO_C_IRQ_0);
@@ -432,7 +432,7 @@ static int gpio_rv32m1_portd_init(struct device *dev)
 {
 #ifdef DT_OPENISA_RV32M1_GPIO_GPIO_D_IRQ_0
 	IRQ_CONNECT(DT_OPENISA_RV32M1_GPIO_GPIO_D_IRQ_0,
-		    DT_OPENISA_RV32M1_GPIO_GPIO_D_IRQ_0_PRIORITY,
+		    0,
 		    gpio_rv32m1_port_isr, DEVICE_GET(gpio_rv32m1_portd), 0);
 
 	irq_enable(DT_OPENISA_RV32M1_GPIO_GPIO_D_IRQ_0);
@@ -477,7 +477,7 @@ static int gpio_rv32m1_porte_init(struct device *dev)
 {
 #ifdef DT_OPENISA_RV32M1_GPIO_GPIO_E_IRQ_0
 	IRQ_CONNECT(DT_OPENISA_RV32M1_GPIO_GPIO_E_IRQ_0,
-		    DT_OPENISA_RV32M1_GPIO_GPIO_E_IRQ_0_PRIORITY,
+		    0,
 		    gpio_rv32m1_port_isr, DEVICE_GET(gpio_rv32m1_porte), 0);
 
 	irq_enable(DT_OPENISA_RV32M1_GPIO_GPIO_E_IRQ_0);

diff --git a/drivers/i2c/i2c_rv32m1_lpi2c.c b/drivers/i2c/i2c_rv32m1_lpi2c.c
@@ -290,7 +290,7 @@ static const struct i2c_driver_api rv32m1_lpi2c_driver_api = {
 	static void rv32m1_lpi2c_irq_config_func_##id(struct device *dev)      \
 	{                                                                      \
 		IRQ_CONNECT(DT_OPENISA_RV32M1_LPI2C_I2C_##id##_IRQ_0,          \
-			    DT_OPENISA_RV32M1_LPI2C_I2C_##id##_IRQ_0_PRI,      \
+			    0,						       \
 			    rv32m1_lpi2c_isr, DEVICE_GET(rv32m1_lpi2c_##id),   \
 			    0);                                                \
 		irq_enable(DT_OPENISA_RV32M1_LPI2C_I2C_##id##_IRQ_0);          \

diff --git a/drivers/serial/uart_rv32m1_lpuart.c b/drivers/serial/uart_rv32m1_lpuart.c
@@ -326,7 +326,7 @@ DEVICE_AND_API_INIT(uart_0, DT_OPENISA_RV32M1_LPUART_UART_0_LABEL,
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static void rv32m1_lpuart_config_func_0(struct device *dev)
 {
-	IRQ_CONNECT(DT_OPENISA_RV32M1_LPUART_UART_0_IRQ_0, DT_OPENISA_RV32M1_LPUART_UART_0_IRQ_PRI, rv32m1_lpuart_isr,
+	IRQ_CONNECT(DT_OPENISA_RV32M1_LPUART_UART_0_IRQ_0, 0, rv32m1_lpuart_isr,
 		    DEVICE_GET(uart_0), 0);
 
 	irq_enable(DT_OPENISA_RV32M1_LPUART_UART_0_IRQ_0);
@@ -367,7 +367,7 @@ DEVICE_AND_API_INIT(uart_1, DT_OPENISA_RV32M1_LPUART_UART_1_LABEL,
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static void rv32m1_lpuart_config_func_1(struct device *dev)
 {
-	IRQ_CONNECT(DT_OPENISA_RV32M1_LPUART_UART_1_IRQ_0, DT_OPENISA_RV32M1_LPUART_UART_1_IRQ_PRI, rv32m1_lpuart_isr,
+	IRQ_CONNECT(DT_OPENISA_RV32M1_LPUART_UART_1_IRQ_0, 0, rv32m1_lpuart_isr,
 		    DEVICE_GET(uart_1), 0);
 
 	irq_enable(DT_OPENISA_RV32M1_LPUART_UART_1_IRQ_0);
@@ -408,7 +408,7 @@ DEVICE_AND_API_INIT(uart_2, DT_OPENISA_RV32M1_LPUART_UART_2_LABEL,
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static void rv32m1_lpuart_config_func_2(struct device *dev)
 {
-	IRQ_CONNECT(DT_OPENISA_RV32M1_LPUART_UART_2_IRQ_0, DT_OPENISA_RV32M1_LPUART_UART_2_IRQ_PRI, rv32m1_lpuart_isr,
+	IRQ_CONNECT(DT_OPENISA_RV32M1_LPUART_UART_2_IRQ_0, 0, rv32m1_lpuart_isr,
 		    DEVICE_GET(uart_2), 0);
 
 	irq_enable(DT_OPENISA_RV32M1_LPUART_UART_2_IRQ_0);
@@ -449,7 +449,7 @@ DEVICE_AND_API_INIT(uart_3, DT_OPENISA_RV32M1_LPUART_3_LABEL,
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
 static void rv32m1_lpuart_config_func_3(struct device *dev)
 {
-	IRQ_CONNECT(DT_OPENISA_RV32M1_LPUART_UART_3_IRQ_0, DT_OPENISA_RV32M1_LPUART_UART_3_IRQ_PRI, rv32m1_lpuart_isr,
+	IRQ_CONNECT(DT_OPENISA_RV32M1_LPUART_UART_3_IRQ_0, 0, rv32m1_lpuart_isr,
 		    DEVICE_GET(uart_3), 0);
 
 	irq_enable(DT_OPENISA_RV32M1_LPUART_UART_3_IRQ_0);

diff --git a/drivers/timer/rv32m1_lptmr_timer.c b/drivers/timer/rv32m1_lptmr_timer.c
@@ -32,7 +32,6 @@
 
 #define SYSTEM_TIMER_INSTANCE \
 	((LPTMR_Type *)(DT_OPENISA_RV32M1_LPTMR_SYSTEM_LPTMR_BASE_ADDRESS))
-#define SYSTEM_TIMER_IRQ_PRIO 0
 
 #define SIRC_RANGE_8MHZ      SCG_SIRCCFG_RANGE(1)
 #define SIRCDIV3_DIVIDE_BY_1 1
@@ -57,7 +56,7 @@ int z_clock_driver_init(struct device *unused)
 
 	ARG_UNUSED(unused);
 	IRQ_CONNECT(DT_OPENISA_RV32M1_LPTMR_SYSTEM_LPTMR_IRQ_0,
-		    SYSTEM_TIMER_IRQ_PRIO, lptmr_irq_handler, NULL, 0);
+		    0, lptmr_irq_handler, NULL, 0);
 
 	if ((SCG->SIRCCSR & SCG_SIRCCSR_SIRCEN_MASK) == SCG_SIRCCSR_SIRCEN(0)) {
 		/*