diff options
| author | Dmitriy Korovkin <dmitriy.korovkin@windriver.com> | 2016-10-14 11:48:11 -0400 |
|---|---|---|
| committer | Anas Nashif <nashif@linux.intel.com> | 2016-10-22 01:27:02 +0000 |
| commit | 792140a5023d56d74ef7a5843d9db6a02256af66 (patch) | |
| tree | c97337a58a507dee3434bed829f8498b4760c3bc | |
| parent | dc76dbf2ef70428b9ab361bc239b752fead01790 (diff) | |
drivers: Fix type problems when building QMSI rtc driver
In order to avoid type conflicts make sure that ISR_HANDLED
is defined. This makes the ISR the correct type.
Make sure that the pointer for the unused argument for ISR
is of the proper type (NULL).
Change-Id: Ia1873f32d2e2174085f929e318a780a1b2574785
Signed-off-by: Dmitriy Korovkin <dmitriy.korovkin@windriver.com>
| -rw-r--r-- | drivers/rtc/Makefile | 1 | ||||
| -rw-r--r-- | drivers/rtc/rtc_qmsi.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index 19db6287b..9c6ff3c69 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -1 +1,2 @@ obj-$(CONFIG_RTC_QMSI) += rtc_qmsi.o +ccflags-$(CONFIG_RTC_QMSI) += -DENABLE_EXTERNAL_ISR_HANDLING diff --git a/drivers/rtc/rtc_qmsi.c b/drivers/rtc/rtc_qmsi.c index 6738797f8..187e94a84 100644 --- a/drivers/rtc/rtc_qmsi.c +++ b/drivers/rtc/rtc_qmsi.c @@ -166,7 +166,8 @@ static int rtc_qmsi_init(struct device *dev) { rtc_reentrancy_init(dev); - IRQ_CONNECT(QM_IRQ_RTC_0, CONFIG_RTC_0_IRQ_PRI, qm_rtc_isr_0, 0, + IRQ_CONNECT(QM_IRQ_RTC_0, CONFIG_RTC_0_IRQ_PRI, + qm_rtc_isr_0, NULL, IOAPIC_EDGE | IOAPIC_HIGH); /* Unmask RTC interrupt */ |