mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
dma: ste_dma: Fix warning when CONFIG_ARM_LPAE=y
When CONFIG_ARM_LPAE=y the following build warning are generated: drivers/dma/ste_dma40.c:3228:2: warning: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'resource_size_t' [-Wformat] drivers/dma/ste_dma40.c:3582:3: warning: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'resource_size_t' [-Wformat] drivers/dma/ste_dma40.c:3582:3: warning: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'resource_size_t' [-Wformat] drivers/dma/ste_dma40.c:3593:5: warning: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'resource_size_t' [-Wformat] According to Documentation/printk-formats.txt '%pa' can be used to properly print 'resource_size_t'. Also, for printing memory region the '%pr' is more convenient. Reported-by: Kevin Hilman <khilman@linaro.org> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Kevin Hilman <khilman@linaro.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
This commit is contained in:
parent
4d1b80bf7a
commit
3a919d5b43
1 changed files with 5 additions and 7 deletions
|
@ -3226,8 +3226,8 @@ static struct d40_base * __init d40_hw_detect_init(struct platform_device *pdev)
|
|||
num_log_chans = num_phy_chans * D40_MAX_LOG_CHAN_PER_PHY;
|
||||
|
||||
dev_info(&pdev->dev,
|
||||
"hardware rev: %d @ 0x%x with %d physical and %d logical channels\n",
|
||||
rev, res->start, num_phy_chans, num_log_chans);
|
||||
"hardware rev: %d @ %pa with %d physical and %d logical channels\n",
|
||||
rev, &res->start, num_phy_chans, num_log_chans);
|
||||
|
||||
base = kzalloc(ALIGN(sizeof(struct d40_base), 4) +
|
||||
(num_phy_chans + num_log_chans + num_memcpy_chans) *
|
||||
|
@ -3579,9 +3579,7 @@ static int __init d40_probe(struct platform_device *pdev)
|
|||
if (request_mem_region(res->start, resource_size(res),
|
||||
D40_NAME " I/O lcpa") == NULL) {
|
||||
ret = -EBUSY;
|
||||
d40_err(&pdev->dev,
|
||||
"Failed to request LCPA region 0x%x-0x%x\n",
|
||||
res->start, res->end);
|
||||
d40_err(&pdev->dev, "Failed to request LCPA region %pR\n", res);
|
||||
goto failure;
|
||||
}
|
||||
|
||||
|
@ -3589,8 +3587,8 @@ static int __init d40_probe(struct platform_device *pdev)
|
|||
val = readl(base->virtbase + D40_DREG_LCPA);
|
||||
if (res->start != val && val != 0) {
|
||||
dev_warn(&pdev->dev,
|
||||
"[%s] Mismatch LCPA dma 0x%x, def 0x%x\n",
|
||||
__func__, val, res->start);
|
||||
"[%s] Mismatch LCPA dma 0x%x, def %pa\n",
|
||||
__func__, val, &res->start);
|
||||
} else
|
||||
writel(res->start, base->virtbase + D40_DREG_LCPA);
|
||||
|
||||
|
|
Loading…
Reference in a new issue