From patchwork Wed Nov 13 06:30:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 3177021 X-Patchwork-Delegate: vinod.koul@intel.com Return-Path: X-Original-To: patchwork-dmaengine@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 7499EC045B for ; Wed, 13 Nov 2013 06:30:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4F85E205AD for ; Wed, 13 Nov 2013 06:30:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 547492017C for ; Wed, 13 Nov 2013 06:30:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758205Ab3KMGaI (ORCPT ); Wed, 13 Nov 2013 01:30:08 -0500 Received: from mail-pd0-f182.google.com ([209.85.192.182]:49963 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758023Ab3KMGaH (ORCPT ); Wed, 13 Nov 2013 01:30:07 -0500 Received: by mail-pd0-f182.google.com with SMTP id y13so5246962pdi.27 for ; Tue, 12 Nov 2013 22:30:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tqL+oOlowEBCbF4DxEJspy3mTcivTukkCwjbMUxH9wY=; b=ldkbSjJBEhoNWR46mRKMp0b0X+uw9mxT2wkPcOSdiHPLOmaIc34WrbQ+qbTFoq2D28 gi37lQtyeojmRbX6hvKosmD6cvOrZgBA8mBT0zqP11lDMBomjVUXZ/lIfr8Gcw1bgBjb nwheB18FG/5F6de7WzViSlD1JvSXwyhCd9CZnicJI0SILLdz+hdTQf0/R22Lz0de/Ai0 QHaWwLeWdj/Pa5to6U+QEeUracwqF+OluV4NShDbmn87Pgbhu9NcCGnwXpUdkNPVbMUI QlqYiZgsU68iiiV9QdYe6/AdtuY3GBuSwwVsOoRjKSO5nLqgyfpWzXpkUsQG81/3yucE eS8g== X-Gm-Message-State: ALoCoQk10X/RkgyqHXITj5UdspSZgAWQiN7pqbil61B282Rwn6GxG+KM8GrpR/9xajsBWX7bSK5Y X-Received: by 10.68.139.233 with SMTP id rb9mr39748733pbb.29.1384324206937; Tue, 12 Nov 2013 22:30:06 -0800 (PST) Received: from brutus.lixom.net (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPSA id iu7sm41965998pbc.45.2013.11.12.22.30.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Nov 2013 22:30:06 -0800 (PST) From: Olof Johansson To: Vinod Koul Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, Olof Johansson Subject: [PATCH 2/2] dma: imx-sdma: Fix warnings for LPAE builds Date: Tue, 12 Nov 2013 22:30:44 -0800 Message-Id: <1384324244-11330-2-git-send-email-olof@lixom.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1384324244-11330-1-git-send-email-olof@lixom.net> References: <1384324244-11330-1-git-send-email-olof@lixom.net> 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, 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 This resolves a number of warnings such as the below when building with 64-bit dma_addr_t on arm: drivers/dma/imx-sdma.c:1092:3: warning: format '%x' expects argument of type 'unsigned int', but argument 6 has type 'dma_addr_t' [-Wformat=] ..by upcasting to u64 and using %llx. Signed-off-by: Olof Johansson --- drivers/dma/imx-sdma.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index e43c040..4088ff8 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -1089,8 +1089,8 @@ static struct dma_async_tx_descriptor *sdma_prep_slave_sg( param &= ~BD_CONT; } - dev_dbg(sdma->dev, "entry %d: count: %d dma: 0x%08x %s%s\n", - i, count, sg->dma_address, + dev_dbg(sdma->dev, "entry %d: count: %d dma: %#llx %s%s\n", + i, count, (u64)sg->dma_address, param & BD_WRAP ? "wrap" : "", param & BD_INTR ? " intr" : ""); @@ -1163,8 +1163,8 @@ static struct dma_async_tx_descriptor *sdma_prep_dma_cyclic( if (i + 1 == num_periods) param |= BD_WRAP; - dev_dbg(sdma->dev, "entry %d: count: %d dma: 0x%08x %s%s\n", - i, period_len, dma_addr, + dev_dbg(sdma->dev, "entry %d: count: %d dma: %#llx %s%s\n", + i, period_len, (u64)dma_addr, param & BD_WRAP ? "wrap" : "", param & BD_INTR ? " intr" : "");