From patchwork Thu Mar 21 14:55:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 229725 X-Patchwork-Delegate: trini@ti.com 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 BC8C82C00CD for ; Fri, 22 Mar 2013 01:55:36 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 580AF4A033; Thu, 21 Mar 2013 15:55:33 +0100 (CET) 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 agtjO0OIicfy; Thu, 21 Mar 2013 15:55:33 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7038D4A028; Thu, 21 Mar 2013 15:55:30 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 383ED4A028 for ; Thu, 21 Mar 2013 15:55:28 +0100 (CET) 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 ohA2UW0raqf7 for ; Thu, 21 Mar 2013 15:55:26 +0100 (CET) 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-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by theia.denx.de (Postfix) with ESMTPS id 879CF4A020 for ; Thu, 21 Mar 2013 15:55:24 +0100 (CET) Received: by mail-wi0-f171.google.com with SMTP id hn17so6653906wib.10 for ; Thu, 21 Mar 2013 07:55:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer; bh=BtNNsxvt6jq7pbwlo/qGFpPB6buixNJve3ZFQ8rGyxE=; b=XTK1N0CW8r5Ju8A4RQ2EQcf+c6+rJpOk1RnVCad8XEXh82upETuAgW/OVohDDNsTMt cAX4S5IRXNoeZq8a5WB8a/PDECYyAhtT/lLWpadSBBpauB5TynAKyBiNOLm3WNwAfiie kWwsKFNMr7Y1a/w7cvrAOlWeH7W7nA4L3tb2Z8cnGLFg574CPKS7z+SMlqDgUI4Ztayk VnAbHASnKAI+aa4kDhoq3PMZy88tubSmrDqXNsE3qfA7BvOPR8wtuZ0uUJZCLWJSwNv/ ewaxzbyOFKV7aLRIKIhg0EQhsBnSAnlGPuyOeUs0nnlYuCzt9Sjis41VMgVoFX3s9Tp+ mkmQ== X-Received: by 10.180.185.44 with SMTP id ez12mr5353581wic.33.1363877723343; Thu, 21 Mar 2013 07:55:23 -0700 (PDT) Received: from dell.be.48ers.dk ([2001:6f8:1434:0:6267:20ff:fe4e:21b6]) by mx.google.com with ESMTPS id bs6sm5769417wib.4.2013.03.21.07.55.21 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 21 Mar 2013 07:55:22 -0700 (PDT) Received: from peko by dell.be.48ers.dk with local (Exim 4.80) (envelope-from ) id 1UIgtk-0003nE-JX; Thu, 21 Mar 2013 15:55:20 +0100 From: Peter Korsgaard To: u-boot@lists.denx.de, trini@ti.com Date: Thu, 21 Mar 2013 15:55:17 +0100 Message-Id: <1363877717-14546-1-git-send-email-peter.korsgaard@barco.com> X-Mailer: git-send-email 1.7.10.4 Cc: Peter Korsgaard Subject: [U-Boot] [PATCH] spl_mmc: cleanup variable types X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 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 block_read returns unsigned long, so it doesn't make sense to check for < 0. and neither does marking the header structure as const and then casting away the constness to load data into it. Also cleanup some unneeded pointer casting while we're at it. Signed-off-by: Peter Korsgaard Reviewed-by: Tom Rini --- drivers/mmc/spl_mmc.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/spl_mmc.c b/drivers/mmc/spl_mmc.c index 753c6a0..7efdcb8 100644 --- a/drivers/mmc/spl_mmc.c +++ b/drivers/mmc/spl_mmc.c @@ -34,8 +34,9 @@ DECLARE_GLOBAL_DATA_PTR; static void mmc_load_image_raw(struct mmc *mmc) { - u32 image_size_sectors, err; - const struct image_header *header; + unsigned long err; + u32 image_size_sectors; + struct image_header *header; header = (struct image_header *)(CONFIG_SYS_TEXT_BASE - sizeof(struct image_header)); @@ -43,9 +44,9 @@ static void mmc_load_image_raw(struct mmc *mmc) /* read image header to find the image size & load address */ err = mmc->block_dev.block_read(0, CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR, 1, - (void *)header); + header); - if (err <= 0) + if (err == 0) goto end; spl_parse_image_header(header); @@ -60,8 +61,8 @@ static void mmc_load_image_raw(struct mmc *mmc) image_size_sectors, (void *)spl_image.load_addr); end: - if (err <= 0) { - printf("spl: mmc blk read err - %d\n", err); + if (err == 0) { + printf("spl: mmc blk read err - %lu\n", err); hang(); } } @@ -69,7 +70,7 @@ end: #ifdef CONFIG_SPL_FAT_SUPPORT static void mmc_load_image_fat(struct mmc *mmc) { - s32 err; + int err; struct image_header *header; header = (struct image_header *)(CONFIG_SYS_TEXT_BASE - @@ -83,7 +84,7 @@ static void mmc_load_image_fat(struct mmc *mmc) } err = file_fat_read(CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME, - (u8 *)header, sizeof(struct image_header)); + header, sizeof(struct image_header)); if (err <= 0) goto end;