From patchwork Tue Dec 8 15:34:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7799131 Return-Path: X-Original-To: patchwork-dmaengine@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4D8C59F387 for ; Tue, 8 Dec 2015 15:35:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 616A5204B5 for ; Tue, 8 Dec 2015 15:35:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 73FD5203B7 for ; Tue, 8 Dec 2015 15:35:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965303AbbLHPfG (ORCPT ); Tue, 8 Dec 2015 10:35:06 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:62532 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965251AbbLHPfE (ORCPT ); Tue, 8 Dec 2015 10:35:04 -0500 Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue002) with ESMTPSA (Nemesis) id 0Ltibd-1aE46k03K1-011E80; Tue, 08 Dec 2015 16:34:31 +0100 From: Arnd Bergmann To: Vinod Koul Cc: "Dmitry V. Krivenok" , Nicolas Ferre , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Dan Williams , dmaengine@vger.kernel.org Subject: [PATCH] dmaengine: at_hdmac: fix dma_addr_t printing Date: Tue, 08 Dec 2015 16:34:28 +0100 Message-ID: <24590899.3e2244jrdI@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:BaZ7q7daAjRaWqlwrarN5o6WOuTVgGb5I3QEjJ1s5koElDh2pt7 3mcwsyxooR25ge917mbBbXQPbAJW0BReL79WZzCQ/oXGlX3WTRAB1fP0Y9XhJkn9X3BIG1h TpxS87Rlwz66Ytv/uUP9E0SInGu28E8ekGxZI2zRLwTdJ7nZcx9if9hc/MdF/uw7jd0UMiA YJyy5i9yf+MRevh+CP9DQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:A1UEauHNzQc=:egZ2ocVKb+URHdfFufpSrb GYZwyHtW+WFEnt3Ln50+Ci4XIX4HfEl9CXacwPwcij2QJBfEmP6NL214s5o3vj1ypx8OVYSUU 9BRsHC+SNaor2KuADzidjfDaBn7uzGBMAyeoS801OTBtkVdGx+tD6hY4dUhfefy511znh+9+N 6+T28ZmABFdkah6drz3zgvcD7+wybTUuspT5VVMOIMsjFPRFEJV7dCIWCVm6pqtPLJZfXJ8ha LuTt8/NqHKB+tord5hO/g1M3y0TbxUW+6MxP2kVewWs2EDSPXFIQ7ySiUpeykEwgQMwndGRcx 8HYlC4hmn1Ol+c+NtvLspb2saSFCbi7QxOxqtSltUPX6AanCcLYoGf+f90fQynvf6Md/G8qbF GBx4DJRfHnHDx2oKjuaWYKgUoL33IT27zgulRp+KIT3OzbyqAcZUXiB1Uv7HuF3M9JNgZZ9HS 6wnIZjbHBBtPFll9/BZIF7gIXjdA/CYWdYQGTxOub1kC1rhhBxflo/OffsIvbsrRz6yTBnoSh 4Gtk7mTu2I14YH5+Fz8RIcsxJVEZOfYQkIebWvf4FfjKSOR3O0XR4Jg0mOGGYlqhCHdUuI4j5 pOZglRFvOH8pnkjHYeq6ZjiuXlASXAaiyriXGtwMgnpPKM75qxf4181rY7gSQQAYZ4S1fFj1/ C83g4BTer555nT8vZrhTTtvt7XyzHdo9x4eUBxGcZ52+KmhPG3ZBpSAiJlwuMYoQhplyAAnCd Ae39CARjgpJEZDYD Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A recent patch tried to improve the printk output of the atc_dump_lli() function but introduced a bug, in which we end up dereferencing a dma address as a pointer, and we even get a warning for it: drivers/dma/at_hdmac_regs.h: In function 'atc_dump_lli': drivers/dma/at_hdmac_regs.h:388:4: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'dma_addr_t {aka long long unsigned int}' [-Wformat=] This changes the code to pass the DMA address by reference, as expected by printk. Signed-off-by: Arnd Bergmann Fixes: 096117032a36 ("dmaengine: do not use 0x in front of %pad") Acked-by: Nicolas Ferre --- drivers/dma/at_hdmac_regs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/dma/at_hdmac_regs.h b/drivers/dma/at_hdmac_regs.h index 610907dbc11a..0474e4a0f02a 100644 --- a/drivers/dma/at_hdmac_regs.h +++ b/drivers/dma/at_hdmac_regs.h @@ -386,8 +386,8 @@ static void atc_dump_lli(struct at_dma_chan *atchan, struct at_lli *lli) { dev_crit(chan2dev(&atchan->chan_common), " desc: s%pad d%pad ctrl0x%x:0x%x l%pad\n", - lli->saddr, lli->daddr, - lli->ctrla, lli->ctrlb, lli->dscr); + &lli->saddr, &lli->daddr, + lli->ctrla, lli->ctrlb, &lli->dscr); }