Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795053874; b=a9M4sEArwZDMnxzIbSL8GKBtdmuP92Uwl3YmSK6xmMTjWe4c/94YtCkXDRHRgyL+zrx1 akyjUeAzhmmI5sFMlkm0nu/1A2/y465Jw4T/1WS0YMvu7sKgUm2vv1vXRcpuFuIUS/VqQ NVRSV5xJfc4RK3DFQL+ms2h73aikRfHaJjXiZ2cDOJDXzwZB6CC10Y0RJturi5BJyOpht +C2MSlokYvkDlP+pWuhnSTkyUVmNy22pxM7XJY778eYABP1RGUGXUCVzBGi1afAz7yArm mIGeNWuB7RqTnGjpCsqLakXZyNUuvkIkiuD4n/5l8nYyOfUWBFh9u0K/odXeTcVe8pw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795053874; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=ZLzsXyH8JeV0VRS/p93nmj0BrovJSdZxmSzquhEDEOk=; b=Fd+48E+SPQgtHBERHkMg3vhacFvkEzlD4crbgUqUJIS3iCzi4fZK6QeJnDIe/Nal95Mk FLESJLiNfu/POXQG3NsM0zEth4yfYxl+XABGRG0jvHmycGw+G2YqG0Vqwxn3XOcjQeNEO X2C+8vfKF02rB3TwVAUvF5qWjuqeweObX2zKIAtulUXHlSjcIVV3E2Y90/LzoHFkjtTa0 43J8woyCrK9cX4SqPHMPq/ESyLDPoG4tvIBFYPhDGg7RjXPz8oOiheqaiaFxiaN2ufd4i O9jivXXSyulKFuKYA742zDg54iSxfiuDv/Ywe7K9pz9EoBzzO/PXNVYue9QElasVnvw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=JoTmNCnQ; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D6C52606A31C; Thu, 19 Nov 2026 02:04:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=JoTmNCnQ Received: by smtp.kernel.org (Postfix) with ESMTPSA id 358051F000C4; Thu, 19 Nov 2026 02:04:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795053874; bh=ZLzsXyH8JeV0VRS/p93nmj0BrovJSdZxmSzquhEDEOk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JoTmNCnQkL/iRvROSiyGM7zgj0Otoc1aLoREf3yebGoHGpmzDeWL/U7bFuFHOBBTJ N2p/weHx7dGvCUyYuH7ujRvSkBZlvY2fO9vzFixLuiLU04kRMLH3bGRYAXPe9XVWm8 pemteiDtteiTJztU0f48DNZQ0XwOZzDKnp6lzIwQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Bjorn Helgaas , Boris Ostrovsky , Christoph Hellwig , Sasha Levin Subject: [PATCH 5.15 1075/2214] xen/pcifront: Drop pcifront_common_process() tests of pcidev, pdrv Date: Wed, 18 Nov 2026 15:45:51 +0100 Message-ID: <20261118150055.267611974@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Uwe Kleine-König [ Upstream commit 34ab316d7287692bad41ce4a431b43d60a8bd20f ] pcifront_common_process() exits early if pcidev or pcidev->driver are NULL, so simplify it by not checking them again. [bhelgaas: split flag change to separate patch] Link: https://lore.kernel.org/r/20211004125935.2300113-4-u.kleine-koenig@pengutronix.de Signed-off-by: Uwe Kleine-König Signed-off-by: Bjorn Helgaas Reviewed-by: Boris Ostrovsky Reviewed-by: Christoph Hellwig Stable-dep-of: 3b4854b69ee7 ("xen/pcifront: check that an AER callback exists before calling it") Signed-off-by: Sasha Levin --- drivers/pci/xen-pcifront.c | 52 +++++++++++++------------------------- 1 file changed, 17 insertions(+), 35 deletions(-) diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c index 2156c632524d7..aa3b84823e686 100644 --- a/drivers/pci/xen-pcifront.c +++ b/drivers/pci/xen-pcifront.c @@ -588,61 +588,43 @@ static pci_ers_result_t pcifront_common_process(int cmd, struct pcifront_device *pdev, pci_channel_state_t state) { - pci_ers_result_t result; struct pci_driver *pdrv; int bus = pdev->sh_info->aer_op.bus; int devfn = pdev->sh_info->aer_op.devfn; int domain = pdev->sh_info->aer_op.domain; struct pci_dev *pcidev; - int flag = 0; dev_dbg(&pdev->xdev->dev, "pcifront AER process: cmd %x (bus:%x, devfn%x)", cmd, bus, devfn); - result = PCI_ERS_RESULT_NONE; pcidev = pci_get_domain_bus_and_slot(domain, bus, devfn); if (!pcidev || !pcidev->driver) { dev_err(&pdev->xdev->dev, "device or AER driver is NULL\n"); pci_dev_put(pcidev); - return result; + return PCI_ERS_RESULT_NONE; } pdrv = pcidev->driver; - if (pdrv) { - if (pdrv->err_handler && pdrv->err_handler->error_detected) { - pci_dbg(pcidev, "trying to call AER service\n"); - if (pcidev) { - flag = 1; - switch (cmd) { - case XEN_PCI_OP_aer_detected: - result = pdrv->err_handler-> - error_detected(pcidev, state); - break; - case XEN_PCI_OP_aer_mmio: - result = pdrv->err_handler-> - mmio_enabled(pcidev); - break; - case XEN_PCI_OP_aer_slotreset: - result = pdrv->err_handler-> - slot_reset(pcidev); - break; - case XEN_PCI_OP_aer_resume: - pdrv->err_handler->resume(pcidev); - break; - default: - dev_err(&pdev->xdev->dev, - "bad request in aer recovery " - "operation!\n"); - - } - } + if (pdrv->err_handler && pdrv->err_handler->error_detected) { + pci_dbg(pcidev, "trying to call AER service\n"); + switch (cmd) { + case XEN_PCI_OP_aer_detected: + return pdrv->err_handler->error_detected(pcidev, state); + case XEN_PCI_OP_aer_mmio: + return pdrv->err_handler->mmio_enabled(pcidev); + case XEN_PCI_OP_aer_slotreset: + return pdrv->err_handler->slot_reset(pcidev); + case XEN_PCI_OP_aer_resume: + pdrv->err_handler->resume(pcidev); + return PCI_ERS_RESULT_NONE; + default: + dev_err(&pdev->xdev->dev, + "bad request in aer recovery operation!\n"); } } - if (!flag) - result = PCI_ERS_RESULT_NONE; - return result; + return PCI_ERS_RESULT_NONE; } -- 2.53.0