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 0AEBA1BD005; Tue, 2 Jul 2024 17:32:39 +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=1719941559; cv=none; b=dLMLtunHyYokyK5H4Triv29+0lb3FRehgcQVRABAWrD2WD4SH9cIh0uKYWCJQaoUPsn/zzQTjF+ZVRbLe3NJZXH/s0BByed+WdsGauBoKRl7v1Ip9zDBszz6GZO9RGLcuHsf0yYJVhgibAhhZOznjCQLH8qvMdOkaY63tL9QIpk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719941559; c=relaxed/simple; bh=up92P9LzL8GthbgNEUO81m7a+oqH10ddS51oNl3DaZE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ij5xN2OTW4yL1dYDRWbIe7BH2Pv+xH26FxSy6iPL5UGed+xjzjPsJ+x7BVpNvQBNaThxVj2NU75jeqyI7rX/YtWIRUFvjJyZNUwXcZUlfijp+TGMPXGWRK6rBZpi0krAQZLJHs9HuqZ2TLBvDQDokYsPkbzRrOWnSg62Q/CFPQ8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ZnXHfC4U; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ZnXHfC4U" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 412E1C116B1; Tue, 2 Jul 2024 17:32:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1719941558; bh=up92P9LzL8GthbgNEUO81m7a+oqH10ddS51oNl3DaZE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZnXHfC4USpq4defT+SvcudIkE+bUzUdLHKYWUCIOnVlyqB8MSdJ6HN7PqYtv5zdNI ioK7G9Z8iMV3FwZBO0VwMisydLUw76WjAPkVnULJg3bt5GFGpx+EW7ynRR6JrZrZPu skVqi698mT9z/rVmiQaNxyr2eY1QXORvaY126NYo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Adrian Hunter , Ulf Hansson Subject: [PATCH 6.1 069/128] mmc: sdhci-pci: Convert PCIBIOS_* return codes to errnos Date: Tue, 2 Jul 2024 19:04:30 +0200 Message-ID: <20240702170228.844027423@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240702170226.231899085@linuxfoundation.org> References: <20240702170226.231899085@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ilpo Järvinen commit ebc4fc34eae8ddfbef49f2bdaced1bf4167ef80d upstream. jmicron_pmos() and sdhci_pci_probe() use pci_{read,write}_config_byte() that return PCIBIOS_* codes. The return code is then returned as is by jmicron_probe() and sdhci_pci_probe(). Similarly, the return code is also returned as is from jmicron_resume(). Both probe and resume functions should return normal errnos. Convert PCIBIOS_* returns code using pcibios_err_to_errno() into normal errno before returning them the fix these issues. Fixes: 7582041ff3d4 ("mmc: sdhci-pci: fix simple_return.cocci warnings") Fixes: 45211e215984 ("sdhci: toggle JMicron PMOS setting") Cc: stable@vger.kernel.org Signed-off-by: Ilpo Järvinen Acked-by: Adrian Hunter Link: https://lore.kernel.org/r/20240527132443.14038-1-ilpo.jarvinen@linux.intel.com Signed-off-by: Ulf Hansson Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/host/sdhci-pci-core.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) --- a/drivers/mmc/host/sdhci-pci-core.c +++ b/drivers/mmc/host/sdhci-pci-core.c @@ -1330,7 +1330,7 @@ static int jmicron_pmos(struct sdhci_pci ret = pci_read_config_byte(chip->pdev, 0xAE, &scratch); if (ret) - return ret; + goto fail; /* * Turn PMOS on [bit 0], set over current detection to 2.4 V @@ -1341,7 +1341,10 @@ static int jmicron_pmos(struct sdhci_pci else scratch &= ~0x47; - return pci_write_config_byte(chip->pdev, 0xAE, scratch); + ret = pci_write_config_byte(chip->pdev, 0xAE, scratch); + +fail: + return pcibios_err_to_errno(ret); } static int jmicron_probe(struct sdhci_pci_chip *chip) @@ -2201,7 +2204,7 @@ static int sdhci_pci_probe(struct pci_de ret = pci_read_config_byte(pdev, PCI_SLOT_INFO, &slots); if (ret) - return ret; + return pcibios_err_to_errno(ret); slots = PCI_SLOT_INFO_SLOTS(slots) + 1; dev_dbg(&pdev->dev, "found %d slot(s)\n", slots); @@ -2210,7 +2213,7 @@ static int sdhci_pci_probe(struct pci_de ret = pci_read_config_byte(pdev, PCI_SLOT_INFO, &first_bar); if (ret) - return ret; + return pcibios_err_to_errno(ret); first_bar &= PCI_SLOT_INFO_FIRST_BAR_MASK;