| From dhobsong@igel.co.jp Mon Oct 29 00:53:10 2012 |
| From: Damian Hobson-Garcia <dhobsong@igel.co.jp> |
| Date: Mon, 29 Oct 2012 16:50:50 +0900 |
| Subject: [PATCH v2 33/58] ARM: dma-mapping: fix debug messages in dmabounce code |
| To: greg@kroah.com, laurent.pinchart@ideasonboard.com, horms@verge.net.au |
| Cc: ltsi-dev@lists.linuxfoundation.org, dhobsong@igel.co.jp |
| Message-ID: <1351497075-32717-34-git-send-email-dhobsong@igel.co.jp> |
| |
| |
| From: Marek Szyprowski <m.szyprowski@samsung.com> |
| |
| This patch fixes the usage of uninitialized variables in dmabounce code |
| intoduced by commit a227fb92 ('ARM: dma-mapping: remove offset parameter |
| to prepare for generic dma_ops'): |
| arch/arm/common/dmabounce.c: In function ‘dmabounce_sync_for_device’: |
| arch/arm/common/dmabounce.c:409: warning: ‘off’ may be used uninitialized in this function |
| arch/arm/common/dmabounce.c:407: note: ‘off’ was declared here |
| arch/arm/common/dmabounce.c: In function ‘dmabounce_sync_for_cpu’: |
| arch/arm/common/dmabounce.c:369: warning: ‘off’ may be used uninitialized in this function |
| arch/arm/common/dmabounce.c:367: note: ‘off’ was declared here |
| |
| Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> |
| (cherry picked from commit fdb1117325ad719dc39e81209bc622d511db70e0) |
| |
| Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp> |
| Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| --- |
| arch/arm/common/dmabounce.c | 16 ++++++++-------- |
| 1 files changed, 8 insertions(+), 8 deletions(-) |
| |
| diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c |
| index 9d7eb53..aa07f59 100644 |
| --- a/arch/arm/common/dmabounce.c |
| +++ b/arch/arm/common/dmabounce.c |
| @@ -366,8 +366,8 @@ static int __dmabounce_sync_for_cpu(struct device *dev, dma_addr_t addr, |
| struct safe_buffer *buf; |
| unsigned long off; |
| |
| - dev_dbg(dev, "%s(dma=%#x,off=%#lx,sz=%zx,dir=%x)\n", |
| - __func__, addr, off, sz, dir); |
| + dev_dbg(dev, "%s(dma=%#x,sz=%zx,dir=%x)\n", |
| + __func__, addr, sz, dir); |
| |
| buf = find_safe_buffer_dev(dev, addr, __func__); |
| if (!buf) |
| @@ -377,8 +377,8 @@ static int __dmabounce_sync_for_cpu(struct device *dev, dma_addr_t addr, |
| |
| BUG_ON(buf->direction != dir); |
| |
| - dev_dbg(dev, "%s: unsafe buffer %p (dma=%#x) mapped to %p (dma=%#x)\n", |
| - __func__, buf->ptr, virt_to_dma(dev, buf->ptr), |
| + dev_dbg(dev, "%s: unsafe buffer %p (dma=%#x off=%#lx) mapped to %p (dma=%#x)\n", |
| + __func__, buf->ptr, virt_to_dma(dev, buf->ptr), off, |
| buf->safe, buf->safe_dma_addr); |
| |
| DO_STATS(dev->archdata.dmabounce->bounce_count++); |
| @@ -406,8 +406,8 @@ static int __dmabounce_sync_for_device(struct device *dev, dma_addr_t addr, |
| struct safe_buffer *buf; |
| unsigned long off; |
| |
| - dev_dbg(dev, "%s(dma=%#x,off=%#lx,sz=%zx,dir=%x)\n", |
| - __func__, addr, off, sz, dir); |
| + dev_dbg(dev, "%s(dma=%#x,sz=%zx,dir=%x)\n", |
| + __func__, addr, sz, dir); |
| |
| buf = find_safe_buffer_dev(dev, addr, __func__); |
| if (!buf) |
| @@ -417,8 +417,8 @@ static int __dmabounce_sync_for_device(struct device *dev, dma_addr_t addr, |
| |
| BUG_ON(buf->direction != dir); |
| |
| - dev_dbg(dev, "%s: unsafe buffer %p (dma=%#x) mapped to %p (dma=%#x)\n", |
| - __func__, buf->ptr, virt_to_dma(dev, buf->ptr), |
| + dev_dbg(dev, "%s: unsafe buffer %p (dma=%#x off=%#lx) mapped to %p (dma=%#x)\n", |
| + __func__, buf->ptr, virt_to_dma(dev, buf->ptr), off, |
| buf->safe, buf->safe_dma_addr); |
| |
| DO_STATS(dev->archdata.dmabounce->bounce_count++); |
| -- |
| 1.7.5.4 |
| |