| Message ID | 20200506153025.21441-4-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e62a15d97b0adede829ba5b4f1c8e28f230bd8e8 |
| Headers | show |
| Series | [v1,1/8] spi: dw: Zero DMA Tx and Rx configurations on stack | expand |
diff --git a/drivers/spi/spi-dw-mid.c b/drivers/spi/spi-dw-mid.c index 86d9f79267f05..02defb68618d9 100644 --- a/drivers/spi/spi-dw-mid.c +++ b/drivers/spi/spi-dw-mid.c @@ -7,7 +7,6 @@ #include <linux/dma-mapping.h> #include <linux/dmaengine.h> -#include <linux/interrupt.h> #include <linux/slab.h> #include <linux/spi/spi.h> #include <linux/types.h> @@ -15,6 +14,7 @@ #include "spi-dw.h" #ifdef CONFIG_SPI_DW_MID_DMA +#include <linux/irqreturn.h> #include <linux/pci.h> #include <linux/platform_data/dma-dw.h> diff --git a/drivers/spi/spi-dw.h b/drivers/spi/spi-dw.h index aeed49b4a444a..5e1e78210d8d4 100644 --- a/drivers/spi/spi-dw.h +++ b/drivers/spi/spi-dw.h @@ -2,7 +2,7 @@ #ifndef DW_SPI_HEADER_H #define DW_SPI_HEADER_H -#include <linux/interrupt.h> +#include <linux/irqreturn.h> #include <linux/io.h> #include <linux/scatterlist.h>
spi-dw-mid.c along with spi-dw.h are direct users of irqreturn.h and nothing else is being used from interrupt.h. So, switch them to use the former instead of latter one. While here, move the header under #ifdef CONFIG_SPI_DW_MID_DMA in spi-dw-mid.c. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/spi/spi-dw-mid.c | 2 +- drivers/spi/spi-dw.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)