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: 117820 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp2242073qgn; Thu, 2 Nov 2017 07:30:51 -0700 (PDT) X-Google-Smtp-Source: ABhQp+Rv0P7OuqDfUQtNghqnujUuB6mYq61bHEXg+S4YssFUmXC2K6D/l6U9ra9DIn9gupY9USho X-Received: by 10.99.147.3 with SMTP id b3mr3856140pge.352.1509633050975; Thu, 02 Nov 2017 07:30:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509633050; cv=none; d=google.com; s=arc-20160816; b=JnOks3FATjYNPZlVXeefK+8rSwdiRlgw8oyJprph4RPSq/hRMCJ3x0ulJV8x9aftq4 ECzJ3qYEZjPY4OJlZ8Peb3jxx9hPMYJFlX/gECjo7KEBbYzSjEeuDUlFCggnkeM83oKG XoT1isP5td5kqRhTnnVZN7Qazp/R5msP3LatAidccq7iE8xUbnVENLvNFolEEWR3cT8m lkL3pICdtVZvzjk4Mvi102mZPlPK44MrfqA9Yj/XdRj4XOJUev8IQedgR5ojrV0l5BWF r+Zp/aZWShYCmrtIAnUEZl52V4ufvUNiBqU0r6xQ1z2S759EQDi+ZmUepCNxOPdpI21u L+3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=20d5VM73MkqIqBQiEqJfS3+FJ2zaSByqvXhy9SaCa/Y=; b=lZK/yapjDOnpW571h41nd0NEm1klZ30LIRhDI6KMhi6XbQbrwRhg4tmhAd+dgdwcDC PIn4/liLW5K4WsEQOwNxU9XlK4Rptv3H3g4usXCvlYah7W+nnicirMrm/RHypmv/1cke akhW5yFkIO1nZasBXhxJV3hr8kLfFT51c8frRyeywR57USfuPRVaHGpJq7c15zoTK1i9 fBkIoDx9R1Y6LaymhfCcD9gcG5mJXE3B72690UucU6sKA94VeL1Yl+nukta2aQ9PqWvr he1CwKPqWkUxZiZfVm5QfveN+qlrmZgd+yARFPSqFADpZiSNLmXZYL8XBVtGpEhaf5MA aeYQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n9si2521537plp.715.2017.11.02.07.30.50; Thu, 02 Nov 2017 07:30:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933567AbdKBOaq (ORCPT + 26 others); Thu, 2 Nov 2017 10:30:46 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:54766 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933482AbdKBOan (ORCPT ); Thu, 2 Nov 2017 10:30:43 -0400 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 Cc: Arnd Bergmann , Sudip Mukherjee , linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org 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:5sSnuY4IjFM=:WhurCoxcqGBSKJ3amsFB1M +gKPzfgwIBI03kv5WVIT49hKrL/n5qUZ8dBXPBM4FvZF0ASMwgTKnktYLRb70N7OQzhrzcV+N sck19VWxyMhn1Tk80yD/9nsiauHoc9laV/euduc71mg/nhOrTsu+6xwd5PxiNga+QJLfSbQqt E3aUZhFvUwad0vWAv22+/K6DzJhKfw5Wt3Up4I7GsQhFEyB7FuiSe9U4ABlroUEbNDBB9UIK1 LR4HWpZA3HrrR+BJnEIpgIuboD9HDxR7lpr/zeg0jstpD7tNpxtZvxAZ6DK9oVB0Fao6DKwG/ kLOI26tdvTPbFflxNU+XiUZMSpaMxy3U3ZQLyO20xMJdCV9NT9FpxLmOErUgXEadX8sDBMfvC NBtkyx9tMs4qjJd4VHXwyUg8BxnGJ7JrwDZss7MVYesBA3x3l/Pk2YfeBEzZG1qioRL0yiwFO 5z0FTVqQgYXOK2hzkRfAAhQnQ5cRW/ldoOlWRyrfZEiZbLo83tv8/h6KYsboQTmjzS/myZi+u YQfaZfFt2nrvRA79jORzSKGmHL3A3ss88kS5s3/Cg9lyW+2q/Ffyox/KUt6eON7ZcPiNJBo9P Dj8PnX0WsSrrL5ZUOW+1exBMFangD4NZ1Y00vRbgf7DIWxzdBtIbUiVccXH122EJNTyLM2UR5 vsKsKErRTlty0tkeW67+zcQDhCkKSvMHb2Wf6jlBTppOTTLHncs5+BpR9ClneS8AJr0cQ7WRI CXkZ2bRXRrQ5m5lJbKyS/vbGFFoBze0SpU2lJw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/usb/mtu3/mtu3_qmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 Acked-by: Felipe Balbi Acked-by: Chunfeng Yun 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));