From patchwork Wed Jun 11 21:30:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 4338531 Return-Path: X-Original-To: patchwork-linux-mmc@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 304FCBEEAA for ; Wed, 11 Jun 2014 21:31:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5D377202F0 for ; Wed, 11 Jun 2014 21:31:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 84CBF202EC for ; Wed, 11 Jun 2014 21:31:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753946AbaFKVbE (ORCPT ); Wed, 11 Jun 2014 17:31:04 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:55588 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752870AbaFKVbE (ORCPT ); Wed, 11 Jun 2014 17:31:04 -0400 Received: from axis700.grange (dslb-178-009-251-224.pools.arcor-ip.net [178.9.251.224]) by mrelayeu.kundenserver.de (node=mreue102) with ESMTP (Nemesis) id 0LpOFB-1WIVCQ3fjZ-00fCdk; Wed, 11 Jun 2014 23:30:04 +0200 Received: by axis700.grange (Postfix, from userid 1000) id 106E940BDF; Wed, 11 Jun 2014 23:30:03 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id 0DC3940BDD; Wed, 11 Jun 2014 23:30:03 +0200 (CEST) Date: Wed, 11 Jun 2014 23:30:03 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: linux-mmc@vger.kernel.org cc: Chris Ball , Randy Dunlap , Phil Edworthy Subject: [PATCH] mmc: usdhi6rol0: fix compiler warnings Message-ID: MIME-Version: 1.0 X-Provags-ID: V02:K0:NSc7rRbDJlFoyc/y9LzPpUbcAc8ziCuMRdTVZWWrGI+ gb5HVS/zw09TKDS3ge1QbAPUXoRYAkMGtL/oLscSrGVrOkzey0 xTg5VSt7MLPS9lcpAvHiCQGDQh8J4pw5jl+CmW+Zqz/cmue2BV zmc9jmlckXvnCZGGDhpkS7K6bhSkSEX2NDAeEdry5m71Qrrav2 Tdtk5OyDFtXwMtoXfZ/5T5fnON5yb87lDOGeH/s+e9FVGqiUBj 8kXqVEHtcpFlS218u/Vd4MMCwAVuVnd+9P3SaZMvqI1wAFwQYu +KNSXoG0Rt4l/A6jvBXJRY5VFrxxzqQY1tczBka7XfN7ptWJTi tn5g+kn+KeWyJZ4BQGCRwusHPLPwLbgCdQUgP41/YHKM6RNJCV tdObVX+TnsohA== Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, 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 Fix a number of wrong print formats. Signed-off-by: Guennadi Liakhovetski Reported-by: Randy Dunlap Acked-by: Randy Dunlap --- Chris, the "possibl NULL mrq" warning is bogus. It cannot be NULL in the USDHI6_WAIT_FOR_STOP state. But if you prefer, I can fix that one too. drivers/mmc/host/usdhi6rol0.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/host/usdhi6rol0.c b/drivers/mmc/host/usdhi6rol0.c index eb2bbbe..f0a39eb 100644 --- a/drivers/mmc/host/usdhi6rol0.c +++ b/drivers/mmc/host/usdhi6rol0.c @@ -357,7 +357,7 @@ static void *usdhi6_sg_map(struct usdhi6_host *host) WARN(host->pg.page, "%p not properly unmapped!\n", host->pg.page); if (WARN(sg_dma_len(sg) % data->blksz, - "SG size %zd isn't a multiple of block size %zd\n", + "SG size %u isn't a multiple of block size %u\n", sg_dma_len(sg), data->blksz)) return NULL; @@ -459,7 +459,7 @@ static void usdhi6_sg_advance(struct usdhi6_host *host) done = (host->page_idx << PAGE_SHIFT) + host->offset; total = host->sg->offset + sg_dma_len(host->sg); - dev_dbg(mmc_dev(host->mmc), "%s(): %zu of %zu @ %u\n", __func__, + dev_dbg(mmc_dev(host->mmc), "%s(): %zu of %zu @ %zu\n", __func__, done, total, host->offset); if (done < total && host->offset) { @@ -489,7 +489,7 @@ static void usdhi6_sg_advance(struct usdhi6_host *host) host->sg = next; if (WARN(next && sg_dma_len(next) % data->blksz, - "SG size %zd isn't a multiple of block size %zd\n", + "SG size %u isn't a multiple of block size %u\n", sg_dma_len(next), data->blksz)) data->error = -EINVAL; @@ -896,7 +896,7 @@ static void usdhi6_request_done(struct usdhi6_host *host) struct mmc_data *data = mrq->data; if (WARN(host->pg.page || host->head_pg.page, - "Page %p or %p not unmapped: wait %u, CMD%d(%c) @ +0x%x %ux%u in SG%u!\n", + "Page %p or %p not unmapped: wait %u, CMD%d(%c) @ +0x%zx %ux%u in SG%u!\n", host->pg.page, host->head_pg.page, host->wait, mrq->cmd->opcode, data ? (data->flags & MMC_DATA_READ ? 'R' : 'W') : '-', data ? host->offset : 0, data ? data->blocks : 0, @@ -1666,7 +1666,7 @@ static void usdhi6_timeout_work(struct work_struct *work) case USDHI6_WAIT_FOR_READ: case USDHI6_WAIT_FOR_WRITE: dev_dbg(mmc_dev(host->mmc), - "%c: page #%u @ +0x%x %ux%u in SG%u. Current SG %u bytes @ %u\n", + "%c: page #%u @ +0x%zx %ux%u in SG%u. Current SG %u bytes @ %u\n", data->flags & MMC_DATA_READ ? 'R' : 'W', host->page_idx, host->offset, data->blocks, data->blksz, data->sg_len, sg_dma_len(host->sg), host->sg->offset);