Skip to content

Commit

Permalink
mfd: davinci_voicecodec: Remove pointless #include
Browse files Browse the repository at this point in the history
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 <[email protected]>
Acked-by: Sekhar Nori <[email protected]>
Signed-off-by: Lee Jones <[email protected]>
  • Loading branch information
arndb authored and Lee Jones committed Jul 25, 2019
1 parent 197df18 commit b5e29aa
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions drivers/mfd/davinci_voicecodec.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include <sound/pcm.h>

#include <linux/mfd/davinci_voicecodec.h>
#include <mach/hardware.h>

static const struct regmap_config davinci_vc_regmap = {
.reg_bits = 32,
Expand All @@ -31,6 +30,7 @@ static int __init davinci_vc_probe(struct platform_device *pdev)
struct davinci_vc *davinci_vc;
struct resource *res;
struct mfd_cell *cell = NULL;
dma_addr_t fifo_base;
int ret;

davinci_vc = devm_kzalloc(&pdev->dev,
Expand All @@ -48,6 +48,7 @@ static int __init davinci_vc_probe(struct platform_device *pdev)

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

fifo_base = (dma_addr_t)res->start;
davinci_vc->base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(davinci_vc->base)) {
ret = PTR_ERR(davinci_vc->base);
Expand All @@ -70,8 +71,7 @@ static int __init davinci_vc_probe(struct platform_device *pdev)
}

davinci_vc->davinci_vcif.dma_tx_channel = res->start;
davinci_vc->davinci_vcif.dma_tx_addr =
(dma_addr_t)(io_v2p(davinci_vc->base) + DAVINCI_VC_WFIFO);
davinci_vc->davinci_vcif.dma_tx_addr = fifo_base + DAVINCI_VC_WFIFO;

res = platform_get_resource(pdev, IORESOURCE_DMA, 1);
if (!res) {
Expand All @@ -81,8 +81,7 @@ static int __init davinci_vc_probe(struct platform_device *pdev)
}

davinci_vc->davinci_vcif.dma_rx_channel = res->start;
davinci_vc->davinci_vcif.dma_rx_addr =
(dma_addr_t)(io_v2p(davinci_vc->base) + DAVINCI_VC_RFIFO);
davinci_vc->davinci_vcif.dma_rx_addr = fifo_base + DAVINCI_VC_RFIFO;

davinci_vc->dev = &pdev->dev;
davinci_vc->pdev = pdev;
Expand Down

0 comments on commit b5e29aa

Please sign in to comment.