diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 09:17:44 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 09:17:44 +0530 |
| commit | d38e45aa17e91718bc7bd470df99b5bac3e03987 (patch) | |
| tree | 1cf4f88a77917d79315e19572101b94362461661 /include | |
| parent | 11bfedff5594eef74617e6aa02986cf517526b98 (diff) | |
| parent | 71d0bc65ba089e8e769cddad66dae8cb4c49a0d4 (diff) | |
| download | linux-stable-d38e45aa17e91718bc7bd470df99b5bac3e03987.tar.gz linux-stable-d38e45aa17e91718bc7bd470df99b5bac3e03987.tar.bz2 linux-stable-d38e45aa17e91718bc7bd470df99b5bac3e03987.zip | |
Merge branch 'topic/hsu' into for-linus
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dma/hsu.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/linux/dma/hsu.h b/include/linux/dma/hsu.h index aaff68efba5d..197eec63e501 100644 --- a/include/linux/dma/hsu.h +++ b/include/linux/dma/hsu.h @@ -41,8 +41,7 @@ struct hsu_dma_chip { /* Export to the internal users */ int hsu_dma_get_status(struct hsu_dma_chip *chip, unsigned short nr, u32 *status); -irqreturn_t hsu_dma_do_irq(struct hsu_dma_chip *chip, unsigned short nr, - u32 status); +int hsu_dma_do_irq(struct hsu_dma_chip *chip, unsigned short nr, u32 status); /* Export to the platform drivers */ int hsu_dma_probe(struct hsu_dma_chip *chip); @@ -53,10 +52,10 @@ static inline int hsu_dma_get_status(struct hsu_dma_chip *chip, { return 0; } -static inline irqreturn_t hsu_dma_do_irq(struct hsu_dma_chip *chip, - unsigned short nr, u32 status) +static inline int hsu_dma_do_irq(struct hsu_dma_chip *chip, unsigned short nr, + u32 status) { - return IRQ_NONE; + return 0; } static inline int hsu_dma_probe(struct hsu_dma_chip *chip) { return -ENODEV; } static inline int hsu_dma_remove(struct hsu_dma_chip *chip) { return 0; } |