drivers/dma/iop-adma.c: fix new warnings

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

kernel os linux

The recent "drivers/dma: remove unused support for MEMSET operations"
change has fallout from lack of build testing by the author. This
fixes:

drivers/dma/iop-adma.c:1020:13: warning: unused variable 'dma_addr' [-Wunused-variable]
drivers/dma/iop-adma.c:1519:2: warning: format '%s' expects a matching 'char *' argument [-Wformat=]

Signed-off-by: Olof Johansson <olof@lixom.net>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Olof Johansson and committed by

Linus Torvalds 12 years ago f9f0a7d0 d2b4a646

+2 -2

1 changed file

expand all

drivers

dma

iop-adma.c

+2 -2

drivers/dma/iop-adma.c

··· 1017 1017 struct page *xor_srcs[IOP_ADMA_NUM_SRC_TEST]; 1018 1018 struct page *zero_sum_srcs[IOP_ADMA_NUM_SRC_TEST + 1]; 1019 1019 dma_addr_t dma_srcs[IOP_ADMA_NUM_SRC_TEST + 1]; 1020 - dma_addr_t dma_addr, dest_dma; 1020 + dma_addr_t dest_dma; 1021 1021 struct dma_async_tx_descriptor *tx; 1022 1022 struct dma_chan *dma_chan; 1023 1023 dma_cookie_t cookie; ··· 1516 1516 goto err_free_iop_chan; 1517 1517 } 1518 1518 1519 - dev_info(&pdev->dev, "Intel(R) IOP: ( %s%s%s%s%s%s%s)\n", 1519 + dev_info(&pdev->dev, "Intel(R) IOP: ( %s%s%s%s%s%s)\n", 1520 1520 dma_has_cap(DMA_PQ, dma_dev->cap_mask) ? "pq " : "", 1521 1521 dma_has_cap(DMA_PQ_VAL, dma_dev->cap_mask) ? "pq_val " : "", 1522 1522 dma_has_cap(DMA_XOR, dma_dev->cap_mask) ? "xor " : "",