From patchwork Fri Nov 18 15:44:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 696641 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 3tL2QG6M2Jz9t1d for ; Sat, 19 Nov 2016 02:45:42 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="sIc9b5OP"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C56F8B383E; Fri, 18 Nov 2016 16:45:29 +0100 (CET) X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" 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 gY9L7kClkmDG; Fri, 18 Nov 2016 16:45:29 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3757CB3840; Fri, 18 Nov 2016 16:45:17 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5EAF04B9F9 for ; Fri, 18 Nov 2016 16:45:00 +0100 (CET) X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" 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 Vn9L2edpkb47 for ; Fri, 18 Nov 2016 16:45:00 +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-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by theia.denx.de (Postfix) with ESMTPS id 305B54B98A for ; Fri, 18 Nov 2016 16:45:00 +0100 (CET) Received: by mail-wm0-f67.google.com with SMTP id a20so7410926wme.2 for ; Fri, 18 Nov 2016 07:45:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=+bFChYUskY/3IOjDZ2KIYBb/QbPR+cm7qhChlZeKK4s=; b=sIc9b5OPNwuZAj3RXHEMkrBYvXMhJXvBsnOCwsZHbelf+pPOa1DioKobHBDMZMdvXN bMf014ITzMQQzmxjSh8Nn+Osxkx13hiyC2ykym3T0XCl2CHwKC/YturkJKT38PHu0tbe hXvQUPex9GAqNS+qNGe2z26BM0GT9I8Y2hHGPUbQQcHconXBQhByaKUmF6QlaSVaA4Ca rC3k3792Bfr6KMuQ2aq5yHVx4UPQn/Brk6GXze8YOkH1aX16LccYXHs3LDVY9p6oXvqL NU3GO9KCzlHM/K/93M1ZGDAvifwwBUelt7sXzS8djp9M86qF09n4iRUIYgPMRuVT8C3L iw4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:in-reply-to:references; bh=+bFChYUskY/3IOjDZ2KIYBb/QbPR+cm7qhChlZeKK4s=; b=hBDoqPORHvE056DVkLu8r/frPMuHF7zb2UC71DfJXmXv9rEuF6IVj+48f4n1Bwp+Zj SbYYVg/R/IMiBad33OKgbf8eW9CITmOJkwaSUESEjsb1OHIM42A/zU0Ylw8jA/lk45IJ LF+lwe1Odt398fCNs+1KrkqG5lT+iq0hTKBMeuG58kyTf2oU1i4lgSKOwW1yKeUji5/n 6z3D9bT0QVqFNLdxQ1HskiptQplfW9uzJ7uCQmzLFbT4O2WwCRm9YPyl5e4x24NMSD8K RGn02CIDtyUPeYfLQn9P3Zgx6+BmFmIC5juulBDkaCuytRJZxY+0ph4ZsKXVlk2MP0T4 f4TA== X-Gm-Message-State: AKaTC022pvnrdhLEXjXUBD9Yf87Uh6Wc6ulm9ZdLGP+5TgH4ZyzJ+b0x+yMYbQk5B8REow== X-Received: by 10.28.58.14 with SMTP id h14mr428548wma.7.1479483899716; Fri, 18 Nov 2016 07:44:59 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id n17sm9482345wjq.6.2016.11.18.07.44.58 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Fri, 18 Nov 2016 07:44:59 -0800 (PST) From: Michal Simek To: Simon Glass Date: Fri, 18 Nov 2016 16:44:49 +0100 Message-Id: <3347ac596c7e6cf49ee8b28ae833af92423f7eab.1479483880.git.michal.simek@xilinx.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: Cc: Stephen Warren , u-boot@lists.denx.de, Ed Swarthout , Stefan Roese Subject: [U-Boot] [RFC PATCH 4/5] scsi: Move pccb buffer initalization directly to scsi_detect_dev X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" pccb is pointer to temporary buffer which is used only for sending command. Make it local as is done in scsi_read/scsi_write. Signed-off-by: Michal Simek Reviewed-by: Simon Glass --- common/scsi.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/common/scsi.c b/common/scsi.c index c8d43c5b188d..4ac31fe8118b 100644 --- a/common/scsi.c +++ b/common/scsi.c @@ -480,12 +480,14 @@ static void scsi_init_dev_desc(struct blk_desc *dev_desc, int devnum) #endif } -static int scsi_detect_dev(ccb *pccb, struct blk_desc *dev_desc) +static int scsi_detect_dev(int target, struct blk_desc *dev_desc) { unsigned char perq, modi; lbaint_t capacity; unsigned long blksz; + ccb *pccb = (ccb *)&tempccb; + pccb->target = target; pccb->lun = dev_desc->lun; pccb->pdata = (unsigned char *)&tempbuff; pccb->datalen = 512; @@ -553,7 +555,6 @@ void scsi_scan(int mode) { unsigned char i, lun; int ret; - ccb *pccb = (ccb *)&tempccb; if (mode == 1) printf("scanning bus for devices...\n"); @@ -562,11 +563,9 @@ void scsi_scan(int mode) scsi_max_devs = 0; for (i = 0; i < CONFIG_SYS_SCSI_MAX_SCSI_ID; i++) { - pccb->target = i; for (lun = 0; lun < CONFIG_SYS_SCSI_MAX_LUN; lun++) { scsi_dev_desc[scsi_max_devs].lun = lun; - ret = scsi_detect_dev(pccb, - &scsi_dev_desc[scsi_max_devs]); + ret = scsi_detect_dev(i, &scsi_dev_desc[scsi_max_devs]); if (ret) continue;