From patchwork Thu Nov 2 14:30:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10038817 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 534D0603B5 for ; Thu, 2 Nov 2017 14:36:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 44F2C28ADC for ; Thu, 2 Nov 2017 14:36:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 39A62290A4; Thu, 2 Nov 2017 14:36:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CDCE4290A8 for ; Thu, 2 Nov 2017 14:36:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=KMIK5eBC6YNLnyMJm0md9wvcvjF22Z6BUlC+r9tQ9pU=; b=nbG Bv7T0jI39e9JUQKie7ZdjvupWPcj+Zauzf+IFBYv6vrdxrCDQa6U39YZYKXFd3r/ZEOO+B9dW3mbP w6baDxHHXudxYwnUI8qUZEXidJByUSKsSn/5MmbCubZKeh4VaqNkq/leqnufXxQX9iauRHWlh9RXW 5gQ6q4AbwyPSF/TZK9Y1VJDNEG9u/+PthpBq5adRVQq/RRJUAPYbFhCgaUp1moINdMs9ciyxF2St9 cD7Oedx0PmeyNrpJ6H3v6mZRXhBfQ40AMmh6Iwn9Fi58tGxNiOGlQ3/tY6wa1G3PwouFgRvhay6Ap X7+PY7e28MQo9nmGOmP+FRmssBHVe6g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eAGbh-0007TS-LW; Thu, 02 Nov 2017 14:36:33 +0000 Received: from mout.kundenserver.de ([217.72.192.74]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eAGbM-0007Aw-SB; Thu, 02 Nov 2017 14:36:18 +0000 Received: from wuerfel.lan ([109.193.157.232]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0MUo84-1dePGd3WKy-00YEZg; Thu, 02 Nov 2017 15:30:31 +0100 From: Arnd Bergmann To: Felipe Balbi , Chunfeng Yun , Greg Kroah-Hartman Subject: [PATCH] usb: mtu3: fix dma_addr_t printk output again Date: Thu, 2 Nov 2017 15:30:20 +0100 Message-Id: <20171102143027.775184-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:7sZCwaM090ktttzSB8yZdNehYwRod+/rWffnCVnt+vmJwGn8W4q yl9iteGEbNN79L2zlwoWK/irevdqf2s23SnZJX+LaLn0CJXOkH3dXHGP9a4EKcME1fYcuGd 5AySHS9akOMXYt1TB1M662kaUtDS/oO2fupRi75NdDzOO9OCkbow73aEMggWckXYCX/ezry BJ5656UGYer5U456ne/BA== X-UI-Out-Filterresults: notjunk:1; V01:K0:ne7AGHDwEo0=:73gNr1lnlbmQT72NiG3/sY kkRgAW528WE6FrrBszIgmtN/hXIQwvNInwfn8EtT/YK7PxRZry9JRpsDoVzrsdHfk9Z/+zd7C J/l4tSXyf7nnq5d/ZZuiY4/OuTSyUOukdHZ5N2EPA/HnlpQnh+SAZs5hI4hSsw5d7cIHpI138 MyUkUMyUv254M8l9HlbeWy82OEQLo3muywOxr7wsq+H3X8ywTXNg2c4yZbp+ZJ8+sfoHQZEmq 5dXGMQOmKWJmKGTUQp1bFwUtpAttoOS6U/pU30Bxp5eMeMxa4OT7agwj5JvPeqTn0I1FUyrDT x9ADvgqHLCEpsg7YcYw3KWh4bbmOUDB46krHoXlmsaWYTn40Gr3zzAmsfD4BEpWxluEO3DwlU E8CxNCl/e5rYoBozoQs/rdBczvfDPY1qZYvmgjQz7DgZZ3FWYuR2ZUBYySKU0lFQJ8MDlMiZy Z6cWiROfwZvjfi29V2/W9LcZfa3iXDegQnZU3ShIkFl2iypBdEcDOrgGMN1svIXw3TdhfFM8j 82RhuM168hAm+kuMcAlDs04Ya4Psjmaz6yuk5T+af6ttCHii+qclG5vQDo4cGs70xKrDloQof IhIgr8F0IFc6FQsNRfXQaGn0/7sCbacMWo3qSKAZL/Wc7+PKJDDPzqW/k9TtrLFeoDffJg/7q eSEGJ62uqPTWcz1tuugyVeXYHDZES+o7fWOX3U9FqSUXIkLzJd/oO586IY/Z53oS82BvWwPtC xXe1QRglb1X/xlJeymVE4O1/x2+hoPHZbOyS7g== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171102_073613_260784_2BBF993C X-CRM114-Status: UNSURE ( 9.32 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, Sudip Mukherjee , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The support for 36-bit addresses originally came with an incorrect printk format for dma addresses. Felipe changed the format string it while applying, but the result was still incorrect, since we now have to pass a pointer to the address instead of the integer value: drivers/usb/mtu3/mtu3_qmu.c: In function 'mtu3_prepare_tx_gpd': drivers/usb/mtu3/mtu3_qmu.c:261:25: error: format '%p' expects argument of type 'void *', but argument 7 has type 'dma_addr_t {aka unsigned int}' [-Werror=format=] drivers/usb/mtu3/mtu3_qmu.c: In function 'mtu3_prepare_rx_gpd': drivers/usb/mtu3/mtu3_qmu.c:300:25: error: format '%p' expects argument of type 'void *', but argument 7 has type 'dma_addr_t {aka unsigned int}' [-Werror=format=] This fixes the printk argument accordingly. Fixes: 1a46dfea0841 ("usb: mtu3: support 36-bit DMA address") Signed-off-by: Arnd Bergmann Acked-by: Felipe Balbi Acked-by: Chunfeng Yun --- drivers/usb/mtu3/mtu3_qmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/mtu3/mtu3_qmu.c b/drivers/usb/mtu3/mtu3_qmu.c index 42145a3f1422..0b4b412b1d0d 100644 --- a/drivers/usb/mtu3/mtu3_qmu.c +++ b/drivers/usb/mtu3/mtu3_qmu.c @@ -259,7 +259,7 @@ static int mtu3_prepare_tx_gpd(struct mtu3_ep *mep, struct mtu3_request *mreq) enq = advance_enq_gpd(ring); enq_dma = gpd_virt_to_dma(ring, enq); dev_dbg(mep->mtu->dev, "TX-EP%d queue gpd=%p, enq=%p, qdma=%pad\n", - mep->epnum, gpd, enq, enq_dma); + mep->epnum, gpd, enq, &enq_dma); enq->flag &= ~GPD_FLAGS_HWO; gpd->next_gpd = cpu_to_le32(lower_32_bits(enq_dma)); @@ -298,7 +298,7 @@ static int mtu3_prepare_rx_gpd(struct mtu3_ep *mep, struct mtu3_request *mreq) enq = advance_enq_gpd(ring); enq_dma = gpd_virt_to_dma(ring, enq); dev_dbg(mep->mtu->dev, "RX-EP%d queue gpd=%p, enq=%p, qdma=%pad\n", - mep->epnum, gpd, enq, enq_dma); + mep->epnum, gpd, enq, &enq_dma); enq->flag &= ~GPD_FLAGS_HWO; gpd->next_gpd = cpu_to_le32(lower_32_bits(enq_dma));