summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arc/platforms/quark_se_ss/platform_config.c3
-rw-r--r--arch/x86/platforms/quark_se/quark_se_config.c2
-rw-r--r--doc/kernel/nanokernel/nanokernel_interrupts.rst2
-rw-r--r--drivers/adc/adc_dw.c4
-rw-r--r--drivers/aio/aio_dw_comparator.c2
-rw-r--r--drivers/bluetooth/uart.c2
-rw-r--r--drivers/console/uart_console.c2
-rw-r--r--drivers/console/uart_pipe.c2
-rw-r--r--drivers/ethernet/eth_dw.c2
-rw-r--r--drivers/gpio/gpio_dw.c4
-rw-r--r--drivers/i2c/i2c_dw.c4
-rw-r--r--drivers/rtc/rtc_dw.c2
-rw-r--r--drivers/shared_irq/shared_irq.c4
-rw-r--r--drivers/spi/dw_spi.c4
-rw-r--r--drivers/spi/intel_spi.c4
-rw-r--r--drivers/timer/hpet.c2
-rw-r--r--drivers/timer/loapic_timer.c2
-rw-r--r--drivers/watchdog/wdt_dw.c2
-rw-r--r--include/arch/arc/arch.h3
-rw-r--r--include/arch/arm/cortex_m/irq.h3
-rw-r--r--include/arch/x86/arch.h3
21 files changed, 27 insertions, 31 deletions
diff --git a/arch/arc/platforms/quark_se_ss/platform_config.c b/arch/arc/platforms/quark_se_ss/platform_config.c
index a75f05dab..3441580a7 100644
--- a/arch/arc/platforms/quark_se_ss/platform_config.c
+++ b/arch/arc/platforms/quark_se_ss/platform_config.c
@@ -27,8 +27,7 @@ IRQ_CONNECT_STATIC(quark_se_ipi, QUARK_SE_IPI_INTERRUPT,
static int arc_quark_se_ipi_init(void)
{
- IRQ_CONFIG(quark_se_ipi, QUARK_SE_IPI_INTERRUPT,
- QUARK_SE_IPI_INTERRUPT_PRI);
+ IRQ_CONFIG(quark_se_ipi, QUARK_SE_IPI_INTERRUPT);
irq_enable(QUARK_SE_IPI_INTERRUPT);
return DEV_OK;
}
diff --git a/arch/x86/platforms/quark_se/quark_se_config.c b/arch/x86/platforms/quark_se/quark_se_config.c
index a3faf912b..0721ea321 100644
--- a/arch/x86/platforms/quark_se/quark_se_config.c
+++ b/arch/x86/platforms/quark_se/quark_se_config.c
@@ -32,7 +32,7 @@ IRQ_CONNECT_STATIC(quark_se_ipi, QUARK_SE_IPI_INTERRUPT, QUARK_SE_IPI_INTERRUPT_
static int x86_quark_se_ipi_init(void)
{
- IRQ_CONFIG(quark_se_ipi, QUARK_SE_IPI_INTERRUPT, 0);
+ IRQ_CONFIG(quark_se_ipi, QUARK_SE_IPI_INTERRUPT);
irq_enable(QUARK_SE_IPI_INTERRUPT);
return DEV_OK;
}
diff --git a/doc/kernel/nanokernel/nanokernel_interrupts.rst b/doc/kernel/nanokernel/nanokernel_interrupts.rst
index 0b7d3f27a..4a93e7567 100644
--- a/doc/kernel/nanokernel/nanokernel_interrupts.rst
+++ b/doc/kernel/nanokernel/nanokernel_interrupts.rst
@@ -109,7 +109,7 @@ Example
void my_isr_installer(void)
{
...
- IRQ_CONFIG(my_dev, MY_DEV_IRQ, 0); /* finish IRQ configuration */
+ IRQ_CONFIG(my_dev, MY_DEV_IRQ); /* finish IRQ configuration */
irq_enable(MY_DEV_IRQ); /* enable IRQ */
...
}
diff --git a/drivers/adc/adc_dw.c b/drivers/adc/adc_dw.c
index 243776f6c..da1446b3c 100644
--- a/drivers/adc/adc_dw.c
+++ b/drivers/adc/adc_dw.c
@@ -338,9 +338,9 @@ static void adc_config_0_irq(struct device *dev)
{
struct adc_config *config = dev->config->config_info;
- IRQ_CONFIG(adc_dw_0_rx, IO_ADC0_INT_IRQ, 0);
+ IRQ_CONFIG(adc_dw_0_rx, IO_ADC0_INT_IRQ);
irq_enable(config->rx_vector);
- IRQ_CONFIG(adc_dw_0_err, IO_ADC0_INT_ERR, 0);
+ IRQ_CONFIG(adc_dw_0_err, IO_ADC0_INT_ERR);
irq_enable(config->err_vector);
}
#endif
diff --git a/drivers/aio/aio_dw_comparator.c b/drivers/aio/aio_dw_comparator.c
index d73049f2e..98cbb4f9a 100644
--- a/drivers/aio/aio_dw_comparator.c
+++ b/drivers/aio/aio_dw_comparator.c
@@ -29,7 +29,7 @@ static int dw_aio_cmp_config(struct device *dev)
{
ARG_UNUSED(dev);
- IRQ_CONFIG(dw_aio_cmp, INT_AIO_CMP_IRQ, 0);
+ IRQ_CONFIG(dw_aio_cmp, INT_AIO_CMP_IRQ);
return DEV_OK;
}
diff --git a/drivers/bluetooth/uart.c b/drivers/bluetooth/uart.c
index 547c86186..803ea5807 100644
--- a/drivers/bluetooth/uart.c
+++ b/drivers/bluetooth/uart.c
@@ -231,7 +231,7 @@ static void bt_uart_setup(struct device *uart)
uart_irq_rx_disable(uart);
uart_irq_tx_disable(uart);
- IRQ_CONFIG(bluetooth, uart_irq_get(uart), 0);
+ IRQ_CONFIG(bluetooth, uart_irq_get(uart));
irq_enable(uart_irq_get(uart));
/* Drain the fifo */
diff --git a/drivers/console/uart_console.c b/drivers/console/uart_console.c
index 191e368b6..ec980256d 100644
--- a/drivers/console/uart_console.c
+++ b/drivers/console/uart_console.c
@@ -180,7 +180,7 @@ static void console_input_init(void)
uart_irq_rx_disable(uart_console_dev);
uart_irq_tx_disable(uart_console_dev);
- IRQ_CONFIG(console, uart_irq_get(uart_console_dev), 0);
+ IRQ_CONFIG(console, uart_irq_get(uart_console_dev));
irq_enable(uart_irq_get(uart_console_dev));
/* Drain the fifo */
diff --git a/drivers/console/uart_pipe.c b/drivers/console/uart_pipe.c
index b03eb6c5d..2102ce5d4 100644
--- a/drivers/console/uart_pipe.c
+++ b/drivers/console/uart_pipe.c
@@ -80,7 +80,7 @@ static void uart_pipe_setup(struct device *uart)
{
uart_irq_rx_disable(uart);
uart_irq_tx_disable(uart);
- IRQ_CONFIG(uart_pipe, uart_irq_get(uart), 0);
+ IRQ_CONFIG(uart_pipe, uart_irq_get(uart));
irq_enable(uart_irq_get(uart));
/* Drain the fifo */
diff --git a/drivers/ethernet/eth_dw.c b/drivers/ethernet/eth_dw.c
index 68afa4d41..686590c80 100644
--- a/drivers/ethernet/eth_dw.c
+++ b/drivers/ethernet/eth_dw.c
@@ -325,7 +325,7 @@ static void eth_config_0_irq(struct device *port)
#ifdef CONFIG_ETH_DW_0_IRQ_DIRECT
ARG_UNUSED(shared_irq_dev);
- IRQ_CONFIG(eth_dw_0, config->irq_num, 0);
+ IRQ_CONFIG(eth_dw_0, config->irq_num);
irq_enable(config->irq_num);
#elif defined(CONFIG_ETH_DW_0_IRQ_SHARED)
shared_irq_dev = device_get_binding(config->shared_irq_dev_name);
diff --git a/drivers/gpio/gpio_dw.c b/drivers/gpio/gpio_dw.c
index c3be8df6d..9b972aec0 100644
--- a/drivers/gpio/gpio_dw.c
+++ b/drivers/gpio/gpio_dw.c
@@ -456,7 +456,7 @@ void gpio_config_0_irq(struct device *port)
#ifdef CONFIG_GPIO_DW_0_IRQ_DIRECT
ARG_UNUSED(shared_irq_dev);
- IRQ_CONFIG(gpio_dw_0, config->irq_num, 0);
+ IRQ_CONFIG(gpio_dw_0, config->irq_num);
irq_enable(config->irq_num);
#elif defined(CONFIG_GPIO_DW_0_IRQ_SHARED)
shared_irq_dev = device_get_binding(config->shared_irq_dev_name);
@@ -520,7 +520,7 @@ void gpio_config_1_irq(struct device *port)
#ifdef CONFIG_GPIO_DW_1_IRQ_DIRECT
ARG_UNUSED(shared_irq_dev);
- IRQ_CONFIG(gpio_dw_1, config->irq_num, 0);
+ IRQ_CONFIG(gpio_dw_1, config->irq_num);
irq_enable(config->irq_num);
#elif defined(CONFIG_GPIO_DW_1_IRQ_SHARED)
shared_irq_dev = device_get_binding(config->shared_irq_dev_name);
diff --git a/drivers/i2c/i2c_dw.c b/drivers/i2c/i2c_dw.c
index c01e009d4..85e532467 100644
--- a/drivers/i2c/i2c_dw.c
+++ b/drivers/i2c/i2c_dw.c
@@ -856,7 +856,7 @@ void i2c_config_0(struct device *port)
#if defined(CONFIG_I2C_DW_0_IRQ_DIRECT)
ARG_UNUSED(shared_irq_dev);
- IRQ_CONFIG(i2c_dw_0, config->irq_num, 0);
+ IRQ_CONFIG(i2c_dw_0, config->irq_num);
irq_enable(config->irq_num);
#elif defined(CONFIG_I2C_DW_0_IRQ_SHARED)
ARG_UNUSED(config);
@@ -906,7 +906,7 @@ void i2c_config_1(struct device *port)
struct device *shared_irq_dev;
ARG_UNUSED(shared_irq_dev);
- IRQ_CONFIG(i2c_dw_1, config->irq_num, 0);
+ IRQ_CONFIG(i2c_dw_1, config->irq_num);
irq_enable(config->irq_num);
}
diff --git a/drivers/rtc/rtc_dw.c b/drivers/rtc/rtc_dw.c
index bc2394a50..19cdf82a6 100644
--- a/drivers/rtc/rtc_dw.c
+++ b/drivers/rtc/rtc_dw.c
@@ -138,7 +138,7 @@ static struct rtc_driver_api funcs = {
int rtc_dw_init(struct device *dev)
{
- IRQ_CONFIG(rtc, INT_RTC_IRQ, 0);
+ IRQ_CONFIG(rtc, INT_RTC_IRQ);
irq_enable(INT_RTC_IRQ);
SCSS_INTERRUPT->int_rtc_mask = INT_UNMASK_IA;
dev->driver_api = &funcs;
diff --git a/drivers/shared_irq/shared_irq.c b/drivers/shared_irq/shared_irq.c
index 3e84bd83a..9c0c8a324 100644
--- a/drivers/shared_irq/shared_irq.c
+++ b/drivers/shared_irq/shared_irq.c
@@ -153,7 +153,7 @@ void shared_irq_config_0_irq(struct device *port)
{
struct shared_irq_config *config = port->config->config_info;
- IRQ_CONFIG(shared_irq_0, config->irq_num, 0);
+ IRQ_CONFIG(shared_irq_0, config->irq_num);
}
void shared_irq_isr_0(void *unused)
@@ -187,7 +187,7 @@ void shared_irq_config_1_irq(struct device *port)
{
struct shared_irq_config *config = port->config->config_info;
- IRQ_CONFIG(shared_irq_1, config->irq_num, 0);
+ IRQ_CONFIG(shared_irq_1, config->irq_num);
}
void shared_irq_isr_1(void *unused)
diff --git a/drivers/spi/dw_spi.c b/drivers/spi/dw_spi.c
index d4985a688..911f12690 100644
--- a/drivers/spi/dw_spi.c
+++ b/drivers/spi/dw_spi.c
@@ -471,7 +471,7 @@ void spi_config_0_irq(struct device *dev)
{
struct spi_dw_config *config = dev->config->config_info;
- IRQ_CONFIG(spi_dw_irq_port_0, config->irq, 0);
+ IRQ_CONFIG(spi_dw_irq_port_0, config->irq);
irq_enable(config->irq);
}
@@ -507,7 +507,7 @@ void spi_config_1_irq(struct device *dev)
{
struct spi_dw_config *config = dev->config->config_info;
- IRQ_CONFIG(spi_dw_irq_port_1, config->irq, 0);
+ IRQ_CONFIG(spi_dw_irq_port_1, config->irq);
irq_enable(config->irq);
}
diff --git a/drivers/spi/intel_spi.c b/drivers/spi/intel_spi.c
index 1ae699a38..a8efa1b8e 100644
--- a/drivers/spi/intel_spi.c
+++ b/drivers/spi/intel_spi.c
@@ -468,7 +468,7 @@ void spi_config_0_irq(struct device *dev)
{
struct spi_intel_config *config = dev->config->config_info;
- IRQ_CONFIG(spi_intel_irq_port_0, config->irq, 0);
+ IRQ_CONFIG(spi_intel_irq_port_0, config->irq);
}
#endif /* CONFIG_SPI_INTEL_PORT_0 */
@@ -512,7 +512,7 @@ void spi_config_1_irq(struct device *dev)
{
struct spi_intel_config *config = dev->config->config_info;
- IRQ_CONFIG(spi_intel_irq_port_1, config->irq, 0);
+ IRQ_CONFIG(spi_intel_irq_port_1, config->irq);
}
#endif /* CONFIG_SPI_INTEL_PORT_1 */
diff --git a/drivers/timer/hpet.c b/drivers/timer/hpet.c
index c12244456..f09285fcf 100644
--- a/drivers/timer/hpet.c
+++ b/drivers/timer/hpet.c
@@ -618,7 +618,7 @@ int _sys_clock_driver_init(struct device *device)
* still has to be programmed into the interrupt controller.
*/
- IRQ_CONFIG(hpet, CONFIG_HPET_TIMER_IRQ, 0);
+ IRQ_CONFIG(hpet, CONFIG_HPET_TIMER_IRQ);
/* enable the IRQ in the interrupt controller */
diff --git a/drivers/timer/loapic_timer.c b/drivers/timer/loapic_timer.c
index e8bc237c2..c40c479aa 100644
--- a/drivers/timer/loapic_timer.c
+++ b/drivers/timer/loapic_timer.c
@@ -575,7 +575,7 @@ int _sys_clock_driver_init(struct device *device)
* Although the stub has already been "connected", the vector number
* still has to be programmed into the interrupt controller.
*/
- IRQ_CONFIG(loapic, CONFIG_LOAPIC_TIMER_IRQ, 0);
+ IRQ_CONFIG(loapic, CONFIG_LOAPIC_TIMER_IRQ);
/* Everything has been configured. It is now safe to enable the
* interrupt
diff --git a/drivers/watchdog/wdt_dw.c b/drivers/watchdog/wdt_dw.c
index 987bf977a..c434eef1a 100644
--- a/drivers/watchdog/wdt_dw.c
+++ b/drivers/watchdog/wdt_dw.c
@@ -73,7 +73,7 @@ static int wdt_dw_set_config(struct wdt_config *config)
sys_set_bit(WDT_BASE_ADDR + WDT_CR, 1);
- IRQ_CONFIG(wdt_dw, INT_WDT_IRQ, 0);
+ IRQ_CONFIG(wdt_dw, INT_WDT_IRQ);
irq_enable(INT_WDT_IRQ);
/* unmask WDT interrupts to lmt */
diff --git a/include/arch/arc/arch.h b/include/arch/arc/arch.h
index d28a8faef..e5d2f1a0d 100644
--- a/include/arch/arc/arch.h
+++ b/include/arch/arc/arch.h
@@ -94,12 +94,11 @@ extern void _irq_priority_set(unsigned int irq, unsigned int prio);
* at the priority requested.
* @param device - Device name
* @param i IRQ number
- * @param p Priority for the interruption
*
* @return N/A
*
*/
-#define IRQ_CONFIG(device, i, p) \
+#define IRQ_CONFIG(device, i) \
_irq_priority_set(i, _##device##_int_priority)
#endif
diff --git a/include/arch/arm/cortex_m/irq.h b/include/arch/arm/cortex_m/irq.h
index c48c4c8d9..230888602 100644
--- a/include/arch/arm/cortex_m/irq.h
+++ b/include/arch/arm/cortex_m/irq.h
@@ -81,11 +81,10 @@ extern void _irq_priority_set(unsigned int irq, unsigned int prio);
*
* @param device Device to configure
* @param irq IRQ number
- * @param priority IRQ priority (unused on this architecture)
* @return N/A
*
*/
-#define IRQ_CONFIG(device, irq, priority) \
+#define IRQ_CONFIG(device, irq) \
_irq_priority_set(irq, _##device##_int_priority)
#endif /* _ASMLANGUAGE */
diff --git a/include/arch/x86/arch.h b/include/arch/x86/arch.h
index 949f9cdab..4175a0888 100644
--- a/include/arch/x86/arch.h
+++ b/include/arch/x86/arch.h
@@ -192,12 +192,11 @@ extern unsigned char _irq_to_interrupt_vector[];
* For x86 platform configure APIC and mark interrupt vector allocated
* @param device Device - not used by macro
* @param irq IRQ
- * @param priority IRQ priority, unused on this platform
*
* @return N/A
*
*/
-#define IRQ_CONFIG(device, irq, priority) \
+#define IRQ_CONFIG(device, irq) \
do { \
_SysIntVecProgram(_IRQ_TO_INTERRUPT_VECTOR((irq)), (irq), \
_##device##_irq_flags); \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-21 18:53:21 +0000