Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mfd: davinci_voicecodec: Remove pointless #include

When building davinci as multiplatform, we get a build error
in this file:

drivers/mfd/davinci_voicecodec.c:22:10: fatal error: 'mach/hardware.h' file not found

The header is only used to access the io_v2p() macro, but the
result is already known because that comes from the resource
a little bit earlier.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

authored by

Arnd Bergmann and committed by
Lee Jones
b5e29aa8 197df18f

+4 -5
+4 -5
drivers/mfd/davinci_voicecodec.c
··· 19 19 #include <sound/pcm.h> 20 20 21 21 #include <linux/mfd/davinci_voicecodec.h> 22 - #include <mach/hardware.h> 23 22 24 23 static const struct regmap_config davinci_vc_regmap = { 25 24 .reg_bits = 32, ··· 30 31 struct davinci_vc *davinci_vc; 31 32 struct resource *res; 32 33 struct mfd_cell *cell = NULL; 34 + dma_addr_t fifo_base; 33 35 int ret; 34 36 35 37 davinci_vc = devm_kzalloc(&pdev->dev, ··· 48 48 49 49 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 50 50 51 + fifo_base = (dma_addr_t)res->start; 51 52 davinci_vc->base = devm_ioremap_resource(&pdev->dev, res); 52 53 if (IS_ERR(davinci_vc->base)) { 53 54 ret = PTR_ERR(davinci_vc->base); ··· 71 70 } 72 71 73 72 davinci_vc->davinci_vcif.dma_tx_channel = res->start; 74 - davinci_vc->davinci_vcif.dma_tx_addr = 75 - (dma_addr_t)(io_v2p(davinci_vc->base) + DAVINCI_VC_WFIFO); 73 + davinci_vc->davinci_vcif.dma_tx_addr = fifo_base + DAVINCI_VC_WFIFO; 76 74 77 75 res = platform_get_resource(pdev, IORESOURCE_DMA, 1); 78 76 if (!res) { ··· 81 81 } 82 82 83 83 davinci_vc->davinci_vcif.dma_rx_channel = res->start; 84 - davinci_vc->davinci_vcif.dma_rx_addr = 85 - (dma_addr_t)(io_v2p(davinci_vc->base) + DAVINCI_VC_RFIFO); 84 + davinci_vc->davinci_vcif.dma_rx_addr = fifo_base + DAVINCI_VC_RFIFO; 86 85 87 86 davinci_vc->dev = &pdev->dev; 88 87 davinci_vc->pdev = pdev;