From patchwork Mon May 6 09:32:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 241609 X-Patchwork-Delegate: monstr@monstr.eu 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 BA4972C00B5 for ; Mon, 6 May 2013 19:33:23 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 210734A1FE; Mon, 6 May 2013 11:33:21 +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 hVRiiRezUOu0; Mon, 6 May 2013 11:33:20 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 917524A20A; Mon, 6 May 2013 11:33:18 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3F7A84A20C for ; Mon, 6 May 2013 11:33:11 +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 ym8wAma2EVNP for ; Mon, 6 May 2013 11:33:04 +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-ee0-f52.google.com (mail-ee0-f52.google.com [74.125.83.52]) by theia.denx.de (Postfix) with ESMTPS id 568564A1FE for ; Mon, 6 May 2013 11:32:59 +0200 (CEST) Received: by mail-ee0-f52.google.com with SMTP id d41so1545520eek.25 for ; Mon, 06 May 2013 02:32:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :content-type:x-gm-message-state; bh=4Gf7trIUR/NlNk5GaVUqOS4Oh/Qzqt0DbjMvHX+MsTY=; b=hjU9Ky/BwUQYCi7HW0VFZNu/Q1J5nNG7r5/LFLuWCoktjruIinmDcI5gxuizjROeIO kTzPrynFyU7X4OqTmN/8z7f5zyNCE44GuAppvGwxz1eyfKzvbauasN+HAHR8yafzwW+v CZpbdpoQoKvDQcVAQPifbCqgUcvtuOM8HlkJSd5qNlAolpitXsY2m+NNqMNNd4ZWE5Lw 8v7FAyjVl89kNAmmo5vp3Kx8ORHrjquirWcVHnC//fwG7X/K+V9RSizr7b+bkcV7eV6C 1wJZAVO2rsFBZfjLX5CdvThqcdWTjf8x3OhfRtf84LoBfggEeDWjPhzrjJ9waAiqyLnK mEmw== X-Received: by 10.14.205.194 with SMTP id j42mr35352778eeo.41.1367832777464; Mon, 06 May 2013 02:32:57 -0700 (PDT) Received: from localhost (nat-63.starnet.cz. [178.255.168.63]) by mx.google.com with ESMTPSA id c44sm28804536eeb.4.2013.05.06.02.32.56 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Mon, 06 May 2013 02:32:56 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, Michal Simek , Tom Rini Date: Mon, 6 May 2013 11:32:49 +0200 Message-Id: X-Mailer: git-send-email 1.8.2.1 X-Gm-Message-State: ALoCoQlSTZnbW9RUHr6PEBzIAKqMT33d7FmcdYiPYga4E3YGQHXSOYtX+cEl6hmNbXIPohe0wXoa Cc: Peter Crosthwaite , Jagannadha Sutradharudu Teki Subject: [U-Boot] [PATCH v2 1/2] microblaze: bootm: Fix coding style issues 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 Prepare place for new patch. Signed-off-by: Michal Simek --- Changes in v2: None arch/microblaze/lib/bootm.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) -- 1.8.2.1 diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c index 66d21f4..b992a4d 100644 --- a/arch/microblaze/lib/bootm.c +++ b/arch/microblaze/lib/bootm.c @@ -32,11 +32,12 @@ DECLARE_GLOBAL_DATA_PTR; -int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *images) +int do_bootm_linux(int flag, int argc, char * const argv[], + bootm_headers_t *images) { /* First parameter is mapped to $r5 for kernel boot args */ - void (*theKernel) (char *, ulong, ulong); - char *commandline = getenv ("bootargs"); + void (*thekernel) (char *, ulong, ulong); + char *commandline = getenv("bootargs"); ulong rd_data_start, rd_data_end; if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) @@ -51,10 +52,10 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima of_flat_tree = images->ft_addr; #endif - theKernel = (void (*)(char *, ulong, ulong))images->ep; + thekernel = (void (*)(char *, ulong, ulong))images->ep; /* find ramdisk */ - ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_MICROBLAZE, + ret = boot_get_ramdisk(argc, argv, images, IH_ARCH_MICROBLAZE, &rd_data_start, &rd_data_end); if (ret) return 1; @@ -64,9 +65,10 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima if (!of_flat_tree && argc > 3) of_flat_tree = (char *)simple_strtoul(argv[3], NULL, 16); #ifdef DEBUG - printf ("## Transferring control to Linux (at address 0x%08lx) " \ - "ramdisk 0x%08lx, FDT 0x%08lx...\n", - (ulong) theKernel, rd_data_start, (ulong) of_flat_tree); + printf("## Transferring control to Linux (at address 0x%08lx) ", + (ulong)thekernel); + printf("ramdisk 0x%08lx, FDT 0x%08lx...\n", + rd_data_start, (ulong) of_flat_tree); #endif #ifdef XILINX_USE_DCACHE @@ -78,7 +80,7 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima * r6: pointer to ramdisk * r7: pointer to the fdt, followed by the board info data */ - theKernel (commandline, rd_data_start, (ulong) of_flat_tree); + thekernel(commandline, rd_data_start, (ulong)of_flat_tree); /* does not return */ return 1;