From patchwork Thu Jul 2 14:46:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 192258 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp1510703ilg; Thu, 2 Jul 2020 07:47:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzrHZdd4Ttk0iWykyq/Uus3AI39l90D43CsQDsO7fe/wIo6nDHwCJIIwHrdAynYM5NgH+gW X-Received: by 2002:a17:906:8607:: with SMTP id o7mr27460230ejx.142.1593701268650; Thu, 02 Jul 2020 07:47:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593701268; cv=none; d=google.com; s=arc-20160816; b=Sv0ABQzq3BTIDqkPdsq9OxEB40NvKlaWrYb4hYKY+ulN7Qo/DhYXcZFBFAU5tPUXt/ nuvSmG7QsJ/heNE4xbcXXOGLa8zsDHpUUKWNyYZEL3Dx07YPWZ8CpsFU+wav2c1ZadWo bpdWZTqqS/LePlRvRmSl89YYCN2xtocw+VmamikxHayqMDpUw8A/QApjSTzHa9kS31Eb mIsSPxQ5zhYWrkSAi5TIpqmiQ/y3lDrZPfGDdS3pQNjMAPIS5zdVMrSZqZp1dw3nS3LR IrQa5kDbIv+TVK1NDR5m57fSvgOT3ITJ+a+YwyhA5DqA+tzyYQRkgzYezmELybiAeRi0 1UBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=pP5tNguPzonDyxhQNucE0D3MbWP90cYYUbxgRDFDsUc=; b=KhH+fTgBbsa07b2nJPc0Ebp0vdRrJDwGeiCFuL3A0OPzkhRg7YjLZZjuOqIRLsYYlF NGzYMsHvkgY+KhnZ9cj2AH1hVhSXmsYgkKhRUZqI5ERl9MY1dguyAnMUAWY8deoa3mfR Y9z+RFh7A52xCekj+LaoMGwMnj8wa5I2a00BVlxMLrCeSmX/Jncbf7eLX48UpYds4dQM 16JOAqfM8KtR2yLKGLAP4/peBeiLecq47w1pRyZOZRzwYIIveMzS536rMcHm2s4yYN/D 4LaiB1pSIYQqk6DrrcjWOmEQ92OOeMLxpju25Kl1fGomVIgpBqN7IJb7l4e3cp14Y3lX 1AkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MRCLlu77; spf=pass (google.com: domain of linux-usb-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-usb-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m26si3418673ejn.40.2020.07.02.07.47.48; Thu, 02 Jul 2020 07:47:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-usb-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MRCLlu77; spf=pass (google.com: domain of linux-usb-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-usb-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730181AbgGBOrq (ORCPT + 5 others); Thu, 2 Jul 2020 10:47:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730064AbgGBOrB (ORCPT ); Thu, 2 Jul 2020 10:47:01 -0400 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 53FE4C08C5DD for ; Thu, 2 Jul 2020 07:47:01 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id g75so27085778wme.5 for ; Thu, 02 Jul 2020 07:47:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pP5tNguPzonDyxhQNucE0D3MbWP90cYYUbxgRDFDsUc=; b=MRCLlu77vm2lwEuKfpgTjOHIiNbOSRTeYtgs5c+tcVQF2EOP3Y+PnwvY8yMjo/cJJ9 TpF2T6O2DEjSh+q/g7J04eisB3ct2rVdiBCpsqSLJeVCjttHOc7mvJkWgxLpgTX1G7ih 9zoqFAsZWRUg+4yjqPZtnjfXqRtNRxiUz9bgYGRiZMsU3zRp/oW2DAsNBN8kUjudGQt9 2V6vEeJAtKSdSkRaouvKT1GaOXxATqsbk9o2Agt560AZqfMKPCHBpvFsq9QjR3OwQ2b/ 2wOOxYVGGAVrNGw3vGhZgQmcSwGG/WaDTMsIgDN0ckGLgqnUhN6oSdWcJu49hXBTt01a 6Kqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pP5tNguPzonDyxhQNucE0D3MbWP90cYYUbxgRDFDsUc=; b=CvUK77mYC7wykGpQFtUFCi8suhb+XXJRs7UCrVnQ5K/xjLQPKuMbfxv3EVAozrX3HJ PYQCbQfMIcB2/zSUtT1BGm91GVuDNXl43Sq6eorU3Ajuey/JvzcMLgo7/IqYpdDG9bVr jR90DxCz1i0+mr5j4JBjpPz429Zx3dmV7ja2K9IBSjD8O5XdRNYDzOto9kSCaxioIkbD 5U9ZkaXYA/k7SHiB8GYbPy2eEL2QAXq2gzkZprJQM3AFRk4TV3rMJLGabcDS+egw0qGC mE1CzZqMvCviwR31iFuw4nZ9cULAv8ZAZu0vUiNEnUGpwsCF2ohwT6JOm8YKTPtL3PIV 33Bg== X-Gm-Message-State: AOAM533GA88AZUYKs5t9qvfVHqLQTx5ek51hXg2McQziSDbNW2m4XIRw GcuN94O3v4HtF6kRj2bCAqmzhQ== X-Received: by 2002:a1c:49d7:: with SMTP id w206mr30883650wma.181.1593701220039; Thu, 02 Jul 2020 07:47:00 -0700 (PDT) Received: from localhost.localdomain ([2.27.35.144]) by smtp.gmail.com with ESMTPSA id g14sm7002737wrw.83.2020.07.02.07.46.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2020 07:46:59 -0700 (PDT) From: Lee Jones To: gregkh@linuxfoundation.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Lee Jones , Masahiro Yamada , Rodolfo Giometti , "Eurotech S.p.A" Subject: [PATCH 23/30] usb: host: oxu210hp-hcd: Move declaration of 'qtd' into 'ifdef OXU_URB_TRACE' Date: Thu, 2 Jul 2020 15:46:18 +0100 Message-Id: <20200702144625.2533530-24-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200702144625.2533530-1-lee.jones@linaro.org> References: <20200702144625.2533530-1-lee.jones@linaro.org> MIME-Version: 1.0 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org If we assign 'epnum' during the declaration we can also avoid "ISO C90 forbids mixed declarations" issues. So it does looks like we can have our cake and eat it in this scenario. Fixes the following W=1 kernel build warning(s): drivers/usb/host/oxu210hp-hcd.c: In function ‘submit_async’: drivers/usb/host/oxu210hp-hcd.c:2040:19: warning: variable ‘qtd’ set but not used [-Wunused-but-set-variable] 2040 | struct ehci_qtd *qtd; | ^~~ Cc: Masahiro Yamada Cc: Rodolfo Giometti Cc: "Eurotech S.p.A" Signed-off-by: Lee Jones --- drivers/usb/host/oxu210hp-hcd.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- 2.25.1 diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c index 120666a0d5901..b00673295c9fe 100644 --- a/drivers/usb/host/oxu210hp-hcd.c +++ b/drivers/usb/host/oxu210hp-hcd.c @@ -2037,16 +2037,15 @@ static struct ehci_qh *qh_append_tds(struct oxu_hcd *oxu, static int submit_async(struct oxu_hcd *oxu, struct urb *urb, struct list_head *qtd_list, gfp_t mem_flags) { - struct ehci_qtd *qtd; - int epnum; + int epnum = urb->ep->desc.bEndpointAddress; unsigned long flags; struct ehci_qh *qh = NULL; int rc = 0; +#ifdef OXU_URB_TRACE + struct ehci_qtd *qtd; qtd = list_entry(qtd_list->next, struct ehci_qtd, qtd_list); - epnum = urb->ep->desc.bEndpointAddress; -#ifdef OXU_URB_TRACE oxu_dbg(oxu, "%s %s urb %p ep%d%s len %d, qtd %p [qh %p]\n", __func__, urb->dev->devpath, urb, epnum & 0x0f, (epnum & USB_DIR_IN) ? "in" : "out",