From patchwork Tue Oct 25 09:39:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 121545 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 9D605B6F81 for ; Tue, 25 Oct 2011 20:44:05 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id ABAE82949F; Tue, 25 Oct 2011 11:44:01 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0GzqitRrdyxj; Tue, 25 Oct 2011 11:44:01 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 57813292FE; Tue, 25 Oct 2011 11:41:12 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DFA1D2912A for ; Tue, 25 Oct 2011 11:40:56 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id e2DQ0svo8YtI for ; Tue, 25 Oct 2011 11:40:56 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-bw0-f44.google.com (mail-bw0-f44.google.com [209.85.214.44]) by theia.denx.de (Postfix) with ESMTPS id 0E0492925D for ; Tue, 25 Oct 2011 11:40:20 +0200 (CEST) Received: by mail-bw0-f44.google.com with SMTP id s6so242852bka.3 for ; Tue, 25 Oct 2011 02:40:20 -0700 (PDT) Received: by 10.204.15.80 with SMTP id j16mr3481946bka.26.1319535620783; Tue, 25 Oct 2011 02:40:20 -0700 (PDT) Received: from mashiro.lan (cst-prg-176-30.cust.vodafone.cz. [46.135.176.30]) by mx.google.com with ESMTPS id z9sm26916341bkn.7.2011.10.25.02.40.19 (version=SSLv3 cipher=OTHER); Tue, 25 Oct 2011 02:40:20 -0700 (PDT) From: Marek Vasut To: u-boot@lists.denx.de Date: Tue, 25 Oct 2011 11:39:49 +0200 Message-Id: <1319535604-20831-4-git-send-email-marek.vasut@gmail.com> X-Mailer: git-send-email 1.7.6.3 In-Reply-To: <1319535604-20831-1-git-send-email-marek.vasut@gmail.com> References: <1319535604-20831-1-git-send-email-marek.vasut@gmail.com> Cc: Scott Wood Subject: [U-Boot] [PATCH 03/18] GCC4.6: Squash warning in jedec_flash.c X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de jedec_flash.c: In function 'fill_info': jedec_flash.c:393: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'ulong' jedec_flash.c:393: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'ulong' jedec_flash.c:402: warning: format '%d' expects type 'int', but argument 2 has type 'ulong' jedec_flash.c:402: warning: format '%d' expects type 'int', but argument 3 has type 'ulong' Signed-off-by: Marek Vasut Cc: Wolfgang Denk Cc: Simon Glass Cc: Mike Frysinger Cc: Scott Wood --- drivers/mtd/jedec_flash.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/jedec_flash.c b/drivers/mtd/jedec_flash.c index da8c9b1..36d30c3 100644 --- a/drivers/mtd/jedec_flash.c +++ b/drivers/mtd/jedec_flash.c @@ -390,7 +390,8 @@ static inline void fill_info(flash_info_t *info, const struct amd_flash_info *je debug("unlock address index %d\n", uaddr_idx); info->addr_unlock1 = unlock_addrs[uaddr_idx].addr1; info->addr_unlock2 = unlock_addrs[uaddr_idx].addr2; - debug("unlock addresses are 0x%x/0x%x\n", info->addr_unlock1, info->addr_unlock2); + debug("unlock addresses are 0x%lx/0x%lx\n", + info->addr_unlock1, info->addr_unlock2); sect_cnt = 0; total_size = 0; @@ -399,7 +400,7 @@ static inline void fill_info(flash_info_t *info, const struct amd_flash_info *je ulong erase_region_count = (jedec_entry->regions[i] & 0xff) + 1; total_size += erase_region_size * erase_region_count; - debug ("erase_region_count = %d erase_region_size = %d\n", + debug("erase_region_count = %ld erase_region_size = %ld\n", erase_region_count, erase_region_size); for (j = 0; j < erase_region_count; j++) { if (sect_cnt >= CONFIG_SYS_MAX_FLASH_SECT) {