From nobody Fri Dec 19 15:59:29 2025 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 EADDD222595; Mon, 19 May 2025 21:37:03 +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=1747690624; cv=none; b=DtV1o4HtgKgh97Jqo++t+BQWtfDVW0YmwGp6egFd0nzPiaOnA4ocsNZRyk9SMfYmcVFAj328dXefvNMNW+xUMC29vbh4HARamWfy0q611Jm/lu3iTdjtWmNaoqeeU0J79kUBxnxK7DanxWBhjvFis+55dFlS6OmmoXDU7ob784w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747690624; c=relaxed/simple; bh=aIk3s78Pjc+1Yr5MfxrprcdbuGy62ZG0jyrmmvahF1c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Zx7ojkGzxN9kMgaX/hn6NewgwpKXJesjwRzrMn20rLMNQex+H3w18sOBLhjyw+mRj/+eivaJCP8cf/B+f+grqXZSIKzzGuYPK6u7Fi/eOkUuos9Lf22AQZKoTRgVTCxE6kEigP3GlKu5pdV9l0IiaMDg3nkStrFpD6mjoLcBNv0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CWRWJyaC; 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="CWRWJyaC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3E541C4CEE4; Mon, 19 May 2025 21:37:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747690623; bh=aIk3s78Pjc+1Yr5MfxrprcdbuGy62ZG0jyrmmvahF1c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CWRWJyaCEr9Wq1Bq7IbazqaALn2KniioErpwVjFrt6dwkUCcPXEnkfR/99bzOTsUT /4xhjS4UByA6qTpir4SoXPYs9tJRj5w3wBOYBAqLN1XN7dxkwzQV3qNCnkODW+kGS7 GZ11Eq/6Y1Pe2dT+JeQ2AhtLshsgdqjsHty2QmnONvhrUTG4alCX60FYL1uoLmTuXt hIPzTrLlJ15jmQU5A7E/40edQhPyZQfJKIt+saC5FprcEMa4vjvuoU0260YVEiQQLb OW3uN++ML5A3STxwyNdzvBOeO5vm6qHRyZHmxeuTA16ZYeDLeftimstnUdjhcrn0dV 99inID0+bH+nA== From: Bjorn Helgaas To: linux-pci@vger.kernel.org Cc: Jon Pan-Doh , Karolina Stolarek , 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 Subject: [PATCH v6 08/16] PCI/AER: Simplify pci_print_aer() Date: Mon, 19 May 2025 16:35:50 -0500 Message-ID: <20250519213603.1257897-9-helgaas@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250519213603.1257897-1-helgaas@kernel.org> References: <20250519213603.1257897-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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Ilpo J=C3=A4rvinen --- 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 40f003eca1c5..73d618354f6a 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -765,7 +765,10 @@ void pci_print_aer(struct pci_dev *dev, int aer_severi= ty, { int layer, agent, tlp_header_valid =3D 0; u32 status, mask; - struct aer_err_info info; + struct aer_err_info info =3D { + .severity =3D aer_severity, + .first_error =3D PCI_ERR_CAP_FEP(aer->cap_control), + }; =20 if (aer_severity =3D=3D AER_CORRECTABLE) { status =3D aer->cor_status; @@ -776,14 +779,11 @@ void pci_print_aer(struct pci_dev *dev, int aer_sever= ity, tlp_header_valid =3D status & AER_LOG_TLP_MASKS; } =20 - layer =3D AER_GET_LAYER_ERROR(aer_severity, status); - agent =3D AER_GET_AGENT(aer_severity, status); - - memset(&info, 0, sizeof(info)); - info.severity =3D aer_severity; info.status =3D status; info.mask =3D mask; - info.first_error =3D PCI_ERR_CAP_FEP(aer->cap_control); + + layer =3D AER_GET_LAYER_ERROR(aer_severity, status); + agent =3D AER_GET_AGENT(aer_severity, status); =20 pci_err(dev, "aer_status: 0x%08x, aer_mask: 0x%08x\n", status, mask); __aer_print_error(dev, &info); @@ -797,7 +797,7 @@ void pci_print_aer(struct pci_dev *dev, int aer_severit= y, if (tlp_header_valid) pcie_print_tlp_log(dev, &aer->header_log, dev_fmt(" ")); =20 - 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"); --=20 2.43.0