ASoC: txx9: don't work around too small resource_size_t

The txx9 sound driver deends on HAS_TXX9_ACLC, which is only set for
three tx49xx SOCs, and thus always has a 64-bit phys_addr_t and
resource_size_t.  Instead of poking into ioremap internals to work
around a potentially too small resource_size_t just add a BUILD_BUG_ON
to catch such a case.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/sound/soc/txx9/txx9aclc-ac97.c b/sound/soc/txx9/txx9aclc-ac97.c
index b1d9615f23754b82d3d0dc09f729d44541f9bdb3..7402448bdb090c6fc999c790a77df58981c4483a 100644 (file)
--- a/sound/soc/txx9/txx9aclc-ac97.c
+++ b/sound/soc/txx9/txx9aclc-ac97.c
@@ -175,6 +175,8 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev)
        int err;
        int irq;
 
+       BUILD_BUG_ON(sizeof(drvdata->physbase) > sizeof(r->start));
+
        irq = platform_get_irq(pdev, 0);
        if (irq < 0)
                return irq;
@@ -190,10 +192,6 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, drvdata);
        drvdata->physbase = r->start;
-       if (sizeof(drvdata->physbase) > sizeof(r->start) &&
-           r->start >= TXX9_DIRECTMAP_BASE &&
-           r->start < TXX9_DIRECTMAP_BASE + 0x400000)
-               drvdata->physbase |= 0xf00000000ull;
        err = devm_request_irq(&pdev->dev, irq, txx9aclc_ac97_irq,
                               0, dev_name(&pdev->dev), drvdata);
        if (err < 0)