Commit bba83bf8 authored May 27, 2024 by Ilpo Järvinen Committed by Greg Kroah-Hartman Jul 05, 2024

mmc: sdhci-pci: Convert PCIBIOS_* return codes to errnos



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: 7582041f ("mmc: sdhci-pci: fix simple_return.cocci warnings")
Fixes: 45211e21 ("sdhci: toggle JMicron PMOS setting")
Cc: stable@vger.kernel.org
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20240527132443.14038-1-ilpo.jarvinen@linux.intel.com


Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 65ebdde1

drivers/mmc/host/sdhci-pci-core.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -1103,7 +1103,7 @@ static int jmicron_pmos(struct sdhci_pci_chip *chip, int on)

		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
		@@ -1114,7 +1114,10 @@ static int jmicron_pmos(struct sdhci_pci_chip *chip, int on)
		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)
		@@ -1986,7 +1989,7 @@ static int sdhci_pci_probe(struct pci_dev *pdev,

		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);
		@@ -1997,7 +2000,7 @@ static int sdhci_pci_probe(struct pci_dev *pdev,

		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;