From patchwork Wed Aug 14 12:52:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 2844467 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 980A9BF546 for ; Wed, 14 Aug 2013 12:54:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 82F1B205B9 for ; Wed, 14 Aug 2013 12:54:07 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0A824205B8 for ; Wed, 14 Aug 2013 12:54:06 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V9aaK-0000p9-Rx; Wed, 14 Aug 2013 12:53:57 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V9aaC-0008Bm-Vu; Wed, 14 Aug 2013 12:53:48 +0000 Received: from mail-bk0-f43.google.com ([209.85.214.43]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V9aa5-000889-Tg for linux-arm-kernel@lists.infradead.org; Wed, 14 Aug 2013 12:53:43 +0000 Received: by mail-bk0-f43.google.com with SMTP id mz13so2728820bkb.2 for ; Wed, 14 Aug 2013 05:53:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xqIcNPJVAE/xDhYQ1R2Wu7TqJFyqwoafEwgj7m20Exo=; b=m6hZmWwRJhSHA+Ww0oEaHcxAYNZceAh/SvkP0BUsMb6+CD3DdOwlSfD4kx+uDPR2TM rCqjm89xaFa7FU5KMx0eqlzj8soi0Ia2mGpsNKVAa6YtVdh8sJwogmZKYpunKluk3UaU +10mdAF1qyLiO4ufVHgVFpGsKyffwzaqDhcsmFzyB/G0d2/If5xSsBsqpgxeI2lJm72n NkM1OirZUDfKdzi/nXzLMF0XzElC9mUvBQ734TS3VcMNvfTSjV4XjJBTZExDuVDHISFf jzWZZHIQ6hBVjWc6XnKrkFo5abPqmlrHmSuCCt2AXUoOmZB7Q082sU7I7OIV43q9XA7N 4A4Q== X-Gm-Message-State: ALoCoQkQs/x8a3NguB7d7OFTHEVYhTdtNiZgVv8p1+fakk1vTtMw1OKMePuYJVmwxjc5zCuMukaZ X-Received: by 10.205.22.71 with SMTP id qv7mr6881378bkb.20.1376484802966; Wed, 14 Aug 2013 05:53:22 -0700 (PDT) Received: from slackpad.drs.calxeda.com (f053087239.adsl.alicedsl.de. [78.53.87.239]) by mx.google.com with ESMTPSA id kk2sm3437371bkb.10.2013.08.14.05.53.21 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 14 Aug 2013 05:53:22 -0700 (PDT) From: Andre Przywara To: peter.pearse@arm.com, linus.walleij@linaro.org, linux@arm.linux.org.uk Subject: [PATCH 2/2] DMA: fix printk warning in AMBA PL08x DMA driver Date: Wed, 14 Aug 2013 14:52:09 +0200 Message-Id: <1376484729-11826-3-git-send-email-andre.przywara@linaro.org> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1376484729-11826-1-git-send-email-andre.przywara@linaro.org> References: <1376484729-11826-1-git-send-email-andre.przywara@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130814_085342_155431_14D3E35F X-CRM114-Status: UNSURE ( 9.07 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: vinod.koul@intel.com, Andre Przywara , rob.herring@calxeda.com, linux-arm-kernel@lists.infradead.org, patches@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 In Rob's recent pull request the patch ARM: highbank: select ARCH_DMA_ADDR_T_64BIT for LPAE promotes dma_addr_t to 64bit, so printk generates a warning about an incorrect type. Fix this by casting it to u64 and using %llx. Fixing long lines on the way. Signed-off-by: Andre Przywara --- drivers/dma/amba-pl08x.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c index 29e1cf9..ae19618 100644 --- a/drivers/dma/amba-pl08x.c +++ b/drivers/dma/amba-pl08x.c @@ -850,10 +850,13 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x, pl08x_choose_master_bus(&bd, &mbus, &sbus, cctl); - dev_vdbg(&pl08x->adev->dev, "src=0x%08x%s/%u dst=0x%08x%s/%u len=%zu\n", - bd.srcbus.addr, cctl & PL080_CONTROL_SRC_INCR ? "+" : "", + dev_vdbg(&pl08x->adev->dev, + "src=0x%08llx%s/%u dst=0x%08llx%s/%u len=%zu\n", + (u64)bd.srcbus.addr, + cctl & PL080_CONTROL_SRC_INCR ? "+" : "", bd.srcbus.buswidth, - bd.dstbus.addr, cctl & PL080_CONTROL_DST_INCR ? "+" : "", + (u64)bd.dstbus.addr, + cctl & PL080_CONTROL_DST_INCR ? "+" : "", bd.dstbus.buswidth, bd.remainder); dev_vdbg(&pl08x->adev->dev, "mbus=%s sbus=%s\n",