From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 966582D3A97; Thu, 22 May 2025 23:23:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747956239; cv=none; b=Mbv8t10C86rCyp6crc+ry03wqNxDunLvCH4rbYImI1mNjofeDW6xfeW4QzCKHwL6CbOwTM/cR6vUQu5WGAm6BkyJFCjerhuIYbv/QGJcmMz8RqmoypwHejsZC3pyved4ZBd4fojuy0DydMlcMWbnsi1lqbStx/WDrQC4v0omnc4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747956239; c=relaxed/simple; bh=KEtjoCyDTu7ECBIiCj0AtxIK25UKdSZTkAk180L7y+M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=q7SHcAr2APuynURScUOz8dbUkx5x6QXzPjoYSHMeI3QvV8/nBa9KeRJTBocX2A347hE+IdwwbT1ECDTB5RArp4+Db/KEhr1eh0lkw1FvZjn5HpS4UiOsBaSQg5ppq9y8ra9s8bTxnG4xagkrlvauHjNth9OsvR1yoDNzCyKV/4g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=l3eitsOd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="l3eitsOd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D9ECAC4CEE4; Thu, 22 May 2025 23:23:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747956239; bh=KEtjoCyDTu7ECBIiCj0AtxIK25UKdSZTkAk180L7y+M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l3eitsOdLGHGwymqjY9tVW9GUhxOIOxB7U3icAo39CNUeUP0vhlDmzj2x6E+RWLd7 0ZuIKIiOV1F9dxNngo5Om1laLh8/0mJ13kV4xb+QRbvdDliLp2cwZRaGOx2wYk59rt KMfBRcEm7kpcCe8OHZfV37vobwY73IzdCYM54+rhX8zRVQfJr0pi2vhOPSV2MVkWXZ QkneMIB6Zlivo8LhAFmGVCHgJ6FltQhSz2C7Imz8HU/mVBVei6shieWFqlmlge6kqr uQTQEJHXzMWo3Ofa3UD4maXVq6xxt0vCVdfKS4EK8U18hHB9fmzqe+0CqlR31a0+iB 7Zht0cgW7HugQ== From: Bjorn Helgaas To: linux-pci@vger.kernel.org Cc: Jon Pan-Doh , Karolina Stolarek , Weinan Liu , Martin Petersen , Ben Fuller , Drew Walton , Anil Agrawal , Tony Luck , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Sathyanarayanan Kuppuswamy , Lukas Wunner , Jonathan Cameron , Sargun Dhillon , "Paul E . McKenney" , Mahesh J Salgaonkar , Oliver O'Halloran , Kai-Heng Feng , Keith Busch , Robert Richter , Terry Bowman , Shiju Jose , Dave Jiang , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Bjorn Helgaas , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= Subject: [PATCH v8 09/20] PCI/AER: Simplify pci_print_aer() Date: Thu, 22 May 2025 18:21:15 -0500 Message-ID: <20250522232339.1525671-10-helgaas@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250522232339.1525671-1-helgaas@kernel.org> References: <20250522232339.1525671-1-helgaas@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Bjorn Helgaas Simplify pci_print_aer() by initializing the struct aer_err_info "info" with a designated initializer list (it was previously initialized with memset()) and using pci_name(). Signed-off-by: Bjorn Helgaas Tested-by: Krzysztof Wilczyński Reviewed-by: Ilpo Järvinen Reviewed-by: Jonathan Cameron Reviewed-by: Kuppuswamy Sathyanarayanan Link: https://patch.msgid.link/20250520215047.1350603-10-helgaas@kernel.org --- drivers/pci/pcie/aer.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index 109f5e0ade8a..dc5f4bebd613 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -766,7 +766,10 @@ void pci_print_aer(struct pci_dev *dev, int aer_severity, { int layer, agent, tlp_header_valid = 0; u32 status, mask; - struct aer_err_info info; + struct aer_err_info info = { + .severity = aer_severity, + .first_error = PCI_ERR_CAP_FEP(aer->cap_control), + }; if (aer_severity == AER_CORRECTABLE) { status = aer->cor_status; @@ -777,14 +780,11 @@ void pci_print_aer(struct pci_dev *dev, int aer_severity, tlp_header_valid = status & AER_LOG_TLP_MASKS; } - layer = AER_GET_LAYER_ERROR(aer_severity, status); - agent = AER_GET_AGENT(aer_severity, status); - - memset(&info, 0, sizeof(info)); - info.severity = aer_severity; info.status = status; info.mask = mask; - info.first_error = PCI_ERR_CAP_FEP(aer->cap_control); + + layer = AER_GET_LAYER_ERROR(aer_severity, status); + agent = AER_GET_AGENT(aer_severity, status); pci_err(dev, "aer_status: 0x%08x, aer_mask: 0x%08x\n", status, mask); __aer_print_error(dev, &info); @@ -798,7 +798,7 @@ void pci_print_aer(struct pci_dev *dev, int aer_severity, if (tlp_header_valid) pcie_print_tlp_log(dev, &aer->header_log, dev_fmt(" ")); - trace_aer_event(dev_name(&dev->dev), (status & ~mask), + trace_aer_event(pci_name(dev), (status & ~mask), aer_severity, tlp_header_valid, &aer->header_log); } EXPORT_SYMBOL_NS_GPL(pci_print_aer, "CXL"); -- 2.43.0