From nobody Tue Dec 16 02:15:01 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB5A6C77B72 for ; Thu, 20 Apr 2023 08:20:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234391AbjDTIUG (ORCPT ); Thu, 20 Apr 2023 04:20:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233958AbjDTIUE (ORCPT ); Thu, 20 Apr 2023 04:20:04 -0400 Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D4CB35B1; Thu, 20 Apr 2023 01:20:03 -0700 (PDT) Received: by mail-pl1-x643.google.com with SMTP id d9443c01a7336-1a686260adcso9452195ad.0; Thu, 20 Apr 2023 01:20:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681978803; x=1684570803; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=50LQK5tmVS4ocKInYwi3ul8CsPS2duQjgndHkjAqgs8=; b=b8UWrtSE8d2gqNUM2H1uHk0ortZx/sPCi0GIgOnwb707NJgWvxYj2zXg98MvjfsgvK Z56vAWe2BOIorML3bVHV0psPwQ23v+9blH9HWKN1FSXMvB3bf2Ix8TEiQvZM9QK1NgcH 73L+WZyy1rHGXeD0B5048otp+o9agwOvnDjCPoLqK+Q/nnPuJDwAFRmFYSzre+miVdML l4q2MUTaDU3Zpm9W+l4znRjfq0AnFV/exlYutGBmLSNOGUfmIpemh72QtylzELDDrXQQ 32O8Fh1Z5AoccqRP+cc/17OeWNzqExfvYKI0XPZNZqKeejI4ANXPiWt56+Q9jISSPshr DM8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681978803; x=1684570803; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=50LQK5tmVS4ocKInYwi3ul8CsPS2duQjgndHkjAqgs8=; b=KXL7b9qc8WyFxKRNXllrETwpyZAtVKd5a8X18eXUEsBbjVx3GObzxYCzZUWSsuw5Xr dE4hOREvwuWVN7qNXndRHCEkN08mJdLZPlj22Lan/hW4UFWLJ66sqtu6Sw7VXaGqPorp Vq2RUCew/ROjZbyc5OYgxNJXnXlT+76hUrZGeyDUhyV6/RyvsBD0w2ud4iE3+AsltwsH hMxQUccvjfsb7TFklyuvmysR1fTwHTCJ8Ulm4IkoLeMRYvaZysMh9gl+hpGq4zbVOfv5 QMoQjMQavl4JPDIQmKYBnVgA9I7lAxMRrNbMOV89/Zjrp9liSegMg3VvncyHGwaOAtDm MSnA== X-Gm-Message-State: AAQBX9dSV8TMFBYUVVWCW/yOe7qZN+vtpVkZ1BBH6YyXpGDTgWENi8+P 76Srqrm50A21yi9Zsil1G+c= X-Google-Smtp-Source: AKy350aybx0ziA66zSViUCxz9E9+apBFLxepV9bFNMgfHksbNe6Qc8KN82NS86sC6uCUzn/e316oPQ== X-Received: by 2002:a17:903:2442:b0:19f:188c:3e34 with SMTP id l2-20020a170903244200b0019f188c3e34mr808450pls.53.1681978802743; Thu, 20 Apr 2023 01:20:02 -0700 (PDT) Received: from localhost.localdomain ([43.132.141.9]) by smtp.gmail.com with ESMTPSA id t5-20020a170902a5c500b001a4fecf79e4sm680471plq.49.2023.04.20.01.20.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 01:20:02 -0700 (PDT) From: korantwork@gmail.com To: helgaas@kernel.org, nirmal.patel@linux.intel.com, kbusch@kernel.org, jonathan.derrick@linux.dev, lpieralisi@kernel.org Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Xinghui Li , Dan Carpenter Subject: [PATCH] PCI: vmd: Fix two issues reported by Smatch Date: Thu, 20 Apr 2023 16:19:57 +0800 Message-Id: <20230420081957.1440423-1-korantwork@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Xinghui Li There is one uninitialized symbol error reported by smatch: "drivers/pci/controller/vmd.c:931 vmd_enable_domain() error: uninitialized symbol 'ret'." Fix it by assigning ret with pci_reset_bus return. And one inconsistent indenting warning: "drivers/pci/controller/vmd.c:1058 vmd_resume() warn: inconsistent indenting" Fix it by formating its indenting. Fixes: 0a584655ef89 ("PCI: vmd: Fix secondary bus reset for Intel bridges") Fixes: d899aa668498 ("PCI: vmd: Disable MSI remapping after suspend") Reported-by: Dan Carpenter Signed-off-by: Xinghui Li --- drivers/pci/controller/vmd.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c index 7e1fd959e00d..0a7c1fdfeec0 100644 --- a/drivers/pci/controller/vmd.c +++ b/drivers/pci/controller/vmd.c @@ -943,7 +943,8 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsig= ned long features) if (!list_empty(&child->devices)) { dev =3D list_first_entry(&child->devices, struct pci_dev, bus_list); - if (pci_reset_bus(dev)) + ret =3D pci_reset_bus(dev); + if (ret) pci_warn(dev, "can't reset device: %d\n", ret); =20 break; @@ -1084,10 +1085,10 @@ static int vmd_resume(struct device *dev) struct vmd_dev *vmd =3D pci_get_drvdata(pdev); int err, i; =20 - if (vmd->irq_domain) - vmd_set_msi_remapping(vmd, true); - else - vmd_set_msi_remapping(vmd, false); + if (vmd->irq_domain) + vmd_set_msi_remapping(vmd, true); + else + vmd_set_msi_remapping(vmd, false); =20 for (i =3D 0; i < vmd->msix_count; i++) { err =3D devm_request_irq(dev, vmd->irqs[i].virq, --=20 2.31.1