From patchwork Sun Apr 24 08:29:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joakim Tjernlund X-Patchwork-Id: 92641 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 48A6AB6F6B for ; Sun, 24 Apr 2011 18:30:24 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B16CE280F5; Sun, 24 Apr 2011 10:30:20 +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 lY2ZsAUonmdy; Sun, 24 Apr 2011 10:30:20 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 21478280DB; Sun, 24 Apr 2011 10:30:18 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4BE8B280F6 for ; Sun, 24 Apr 2011 10:29:55 +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 5-lWh-Vlm8TJ for ; Sun, 24 Apr 2011 10:29:54 +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 gw1.transmode.se (gw1.transmode.se [195.58.98.146]) by theia.denx.de (Postfix) with ESMTPS id E20C8280DA for ; Sun, 24 Apr 2011 10:29:47 +0200 (CEST) Received: from mail1.transmode.se (mail1.transmode.se [192.168.201.18]) by gw1.transmode.se (Postfix) with ESMTP id D0E9A258022; Sun, 24 Apr 2011 10:29:46 +0200 (CEST) Received: from gentoo-jocke.transmode.se ([172.20.4.10]) by mail1.transmode.se (Lotus Domino Release 8.5.2FP2) with ESMTP id 2011042410294639-3591 ; Sun, 24 Apr 2011 10:29:46 +0200 Received: from gentoo-jocke.transmode.se (localhost [127.0.0.1]) by gentoo-jocke.transmode.se (8.14.4/8.14.0) with ESMTP id p3O8TkY1023011; Sun, 24 Apr 2011 10:29:46 +0200 Received: (from jocke@localhost) by gentoo-jocke.transmode.se (8.14.4/8.14.4/Submit) id p3O8Tk8I023010; Sun, 24 Apr 2011 10:29:46 +0200 From: Joakim Tjernlund To: u-boot@lists.denx.de, Wolfgang Denk Date: Sun, 24 Apr 2011 10:29:33 +0200 Message-Id: <1303633774-22961-3-git-send-email-Joakim.Tjernlund@transmode.se> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <20110420201335.BC035152160@gemini.denx.de> References: <20110420201335.BC035152160@gemini.denx.de> X-MIMETrack: Itemize by SMTP Server on mail1/Transmode(Release 8.5.2FP2|March 22, 2011) at 04/24/2011 10:29:46, Serialize by Router on mail1/Transmode(Release 8.5.2FP2|March 22, 2011) at 04/24/2011 10:29:46, Serialize complete at 04/24/2011 10:29:46 Cc: Joakim Tjernlund Subject: [U-Boot] [PATCH 2/3] Fix a few gcc warnings. 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 Noticed while building all of mpc8xx Signed-off-by: Joakim Tjernlund --- board/netta/codec.c | 6 +++--- board/siemens/IAD210/atm.c | 4 ++-- examples/standalone/timer.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/board/netta/codec.c b/board/netta/codec.c index 844aa18..c8d31d7 100644 --- a/board/netta/codec.c +++ b/board/netta/codec.c @@ -502,7 +502,7 @@ void codsp_write_sop_short(int duslic_id, int channel, unsigned char regno, unsi void codsp_write_sop_int(int duslic_id, int channel, unsigned char regno, unsigned int val) { - unsigned char cmd[5]; + unsigned char cmd[6]; cmd[0] = CODSP_WR | CODSP_ADR(channel) | CODSP_CMD_SOP; cmd[1] = regno; @@ -577,7 +577,7 @@ void codsp_write_cop_char(int duslic_id, int channel, unsigned char addr, unsign void codsp_write_cop_short(int duslic_id, int channel, unsigned char addr, unsigned short val) { - unsigned char cmd[3]; + unsigned char cmd[4]; cmd[0] = CODSP_WR | CODSP_OP | CODSP_ADR(channel) | CODSP_CMD_COP; cmd[1] = addr; @@ -668,7 +668,7 @@ void codsp_write_pop_short (int duslic_id, int channel, unsigned char regno, void codsp_write_pop_int (int duslic_id, int channel, unsigned char regno, unsigned int val) { - unsigned char cmd[5]; + unsigned char cmd[6]; cmd[0] = CODSP_WR | CODSP_ADR (channel) | CODSP_CMD_POP; cmd[1] = regno; diff --git a/board/siemens/IAD210/atm.c b/board/siemens/IAD210/atm.c index e599c10..40aad0a 100644 --- a/board/siemens/IAD210/atm.c +++ b/board/siemens/IAD210/atm.c @@ -62,7 +62,7 @@ int atmLoad() volatile iop8xx_t *iop = &immap->im_ioport; timers->cpmt_tgcr &= 0x0FFF; SYNC; /* Disable Timer 4 */ - immap->im_cpm.cp_scc[4].scc_gsmrl = 0x0; SYNC; /* Disable SCC4 */ + immap->im_cpm.cp_scc[3].scc_gsmrl = 0x0; SYNC; /* Disable SCC4 */ iop->iop_pdpar &= 0x3FFF; SYNC; /* Disable SAR and UTOPIA */ if ( atmMemInit() != OK ) return ERROR; @@ -96,7 +96,7 @@ void atmUnload() volatile iop8xx_t *iop = &immap->im_ioport; timers->cpmt_tgcr &= 0x0FFF; SYNC; /* Disable Timer 4 */ - immap->im_cpm.cp_scc[4].scc_gsmrl = 0x0; SYNC; /* Disable SCC4 */ + immap->im_cpm.cp_scc[3].scc_gsmrl = 0x0; SYNC; /* Disable SCC4 */ iop->iop_pdpar &= 0x3FFF; SYNC; /* Disable SAR and UTOPIA */ g_atm.loaded = FALSE; } diff --git a/examples/standalone/timer.c b/examples/standalone/timer.c index 834cc9a..a4d4581 100644 --- a/examples/standalone/timer.c +++ b/examples/standalone/timer.c @@ -186,7 +186,7 @@ int timer (int argc, char * const argv[]) /* clear all events */ *hwp->terp = (CPMT_EVENT_CAP | CPMT_EVENT_REF); - printf (usage); + printf("%s", usage); running = 0; while ((c = getc()) != 'q') { if (c == 'b') { @@ -255,7 +255,7 @@ int timer (int argc, char * const argv[]) } else { printf ("\nEnter: q - quit, b - start timer, e - stop timer, ? - get status\n"); } - printf (usage); + printf("%s", usage); } if (running) { printf ("Stopping timer\n");