From patchwork Fri May 3 07:14:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 241230 X-Patchwork-Delegate: albert.aribaud@free.fr 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 795D02C00CA for ; Fri, 3 May 2013 17:15:55 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7DD254A3A6; Fri, 3 May 2013 09:15:51 +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 CV4FYup7tX2t; Fri, 3 May 2013 09:15:51 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8E57D4A3A7; Fri, 3 May 2013 09:14:49 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9F5A14A344 for ; Fri, 3 May 2013 09:14:41 +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 ABkXOeAtsfhp for ; Fri, 3 May 2013 09:14:36 +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-ea0-f182.google.com (mail-ea0-f182.google.com [209.85.215.182]) by theia.denx.de (Postfix) with ESMTPS id 69B3D4A32C for ; Fri, 3 May 2013 09:14:27 +0200 (CEST) Received: by mail-ea0-f182.google.com with SMTP id z16so595296ead.27 for ; Fri, 03 May 2013 00:14:27 -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 :in-reply-to:references:in-reply-to:references:content-type :x-gm-message-state; bh=9+ztwIzP7wIuk5YZizgNbGfAjoMh66Xb/bijR4dVc9I=; b=dQQLX/a1k+/B0P+r8e3LT0g6YbSt1IZUw183vQww9hxK674PVUVF5RwGWP2nVA9dwL JdifOdgB1RhJ80eMTJQ60A/xjfcUakrsLnOMsMH5szC7stSh28SGl7Aphd+lbokNrGRy tn0Pt6KkN8rtoFti0GWgLVllVDIT3duseel5qQpI1v0AyiwPsT0IU9T1VlHpLMS9HAXW N5TTS8DsGsv275bOl6khlz9zkcRpca8Gysz+q+xj9dSK+rgeRJhHIRHgxR2e9qRy6BbU 7rqDRCoqaQk4gMqytlYyRKycb8bjMJM8yrb36l7O+0jMpi+0536Kpm6Li62L4lA7MRar xWFw== X-Received: by 10.14.102.9 with SMTP id c9mr28027432eeg.29.1367565267407; Fri, 03 May 2013 00:14:27 -0700 (PDT) Received: from localhost (nat-63.starnet.cz. [178.255.168.63]) by mx.google.com with ESMTPSA id bk42sm14036364eeb.3.2013.05.03.00.14.26 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Fri, 03 May 2013 00:14:26 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, Albert Aribaud , Tom Rini , Michal Simek , Joe Hershberger Date: Fri, 3 May 2013 09:14:12 +0200 Message-Id: <0e1283363757db10342a5a5a3f3c742db5d54d78.1367565248.git.michal.simek@xilinx.com> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQkBAsFnxZzmC6qTHrgdmfiGuR3aI+hZBmSMnhercebMZd59ZalijoyZuMrYnlKJmezsgBm8 Cc: Peter Crosthwaite , Jagannadha Sutradharudu Teki Subject: [U-Boot] [PATCH v3 5/9] fpga: Change the first parameter in fpga_loadbitstream 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 All fpga functions use devnum as int. Only fpga_loadbitstream is using it as unsinged long dev. This patch synchronize it. Signed-off-by: Michal Simek --- Changes in v3: - New patch in this series Changes in v2: None drivers/fpga/fpga.c | 2 +- drivers/fpga/xilinx.c | 4 ++-- include/fpga.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) -- 1.8.2.1 diff --git a/drivers/fpga/fpga.c b/drivers/fpga/fpga.c index f0253bf..244f503 100644 --- a/drivers/fpga/fpga.c +++ b/drivers/fpga/fpga.c @@ -190,7 +190,7 @@ int fpga_add(fpga_type devtype, void *desc) /* * Convert bitstream data and load into the fpga */ -int __weak fpga_loadbitstream(unsigned long dev, char *fpgadata, size_t size) +int __weak fpga_loadbitstream(int devnum, char *fpgadata, size_t size) { printf("Bitstream support not implemented for this FPGA device\n"); return FPGA_FAIL; diff --git a/drivers/fpga/xilinx.c b/drivers/fpga/xilinx.c index 7d0342a..df5f9bf 100644 --- a/drivers/fpga/xilinx.c +++ b/drivers/fpga/xilinx.c @@ -48,7 +48,7 @@ static int xilinx_validate (Xilinx_desc * desc, char *fn); /* ------------------------------------------------------------------------- */ -int fpga_loadbitstream(unsigned long dev, char *fpgadata, size_t size) +int fpga_loadbitstream(int devnum, char *fpgadata, size_t size) { unsigned int length; unsigned int swapsize; @@ -131,7 +131,7 @@ int fpga_loadbitstream(unsigned long dev, char *fpgadata, size_t size) dataptr += 4; printf(" bytes in bitstream = %d\n", swapsize); - return fpga_load(dev, dataptr, swapsize); + return fpga_load(devnum, dataptr, swapsize); } int xilinx_load(Xilinx_desc *desc, const void *buf, size_t bsize) diff --git a/include/fpga.h b/include/fpga.h index 0d01e04..38f62c0 100644 --- a/include/fpga.h +++ b/include/fpga.h @@ -68,7 +68,7 @@ extern void fpga_init(void); extern int fpga_add(fpga_type devtype, void *desc); extern int fpga_count(void); extern int fpga_load(int devnum, const void *buf, size_t bsize); -extern int fpga_loadbitstream(unsigned long dev, char *fpgadata, size_t size); +extern int fpga_loadbitstream(int devnum, char *fpgadata, size_t size); extern int fpga_dump(int devnum, const void *buf, size_t bsize); extern int fpga_info(int devnum);