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

sdhci_pci_o2_probe() uses pci_read_config_{byte,dword}() that return
PCIBIOS_* codes. The return code is then returned as is but as
sdhci_pci_o2_probe() is probe function chain, it should return normal
errnos.

Convert PCIBIOS_* returns code using pcibios_err_to_errno() into normal
errno before returning them. Add a label for read failure so that the
conversion can be done in one place rather than on all of the return
statements.

Fixes: 3d757ddbd68c ("mmc: sdhci-pci-o2micro: add Bayhub new chip GG8 support for UHS-I")
Fixes: d599005afde8 ("mmc: sdhci-pci-o2micro: Add missing checks in sdhci_pci_o2_probe")
Fixes: 706adf6bc31c ("mmc: sdhci-pci-o2micro: Add SeaBird SeaEagle SD3 support")
Fixes: 01acf6917aed ("mmc: sdhci-pci: add support of O2Micro/BayHubTech SD hosts")
Fixes: 26daa1ed40c6 ("mmc: sdhci: Disable ADMA on some O2Micro SD/MMC parts.")
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-2-ilpo.jarvinen@linux.intel.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci-pci-o2micro.c b/drivers/mmc/host/sdhci-pci-o2micro.c
index d4a02184784a3458b55b601d1fba1216e1ef3149..058bef1c7e41906af4f3969e4af56ad2e50f1881 100644 (file)
--- a/drivers/mmc/host/sdhci-pci-o2micro.c
+++ b/drivers/mmc/host/sdhci-pci-o2micro.c
@@ -823,7 +823,7 @@ static int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip)
                ret = pci_read_config_byte(chip->pdev,
                                O2_SD_LOCK_WP, &scratch);
                if (ret)
-                       return ret;
+                       goto read_fail;
                scratch &= 0x7f;
                pci_write_config_byte(chip->pdev, O2_SD_LOCK_WP, scratch);
 
@@ -834,7 +834,7 @@ static int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip)
                ret = pci_read_config_byte(chip->pdev,
                                O2_SD_CLKREQ, &scratch);
                if (ret)
-                       return ret;
+                       goto read_fail;
                scratch |= 0x20;
                pci_write_config_byte(chip->pdev, O2_SD_CLKREQ, scratch);
 
@@ -843,7 +843,7 @@ static int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip)
                 */
                ret = pci_read_config_byte(chip->pdev, O2_SD_CAPS, &scratch);
                if (ret)
-                       return ret;
+                       goto read_fail;
                scratch |= 0x01;
                pci_write_config_byte(chip->pdev, O2_SD_CAPS, scratch);
                pci_write_config_byte(chip->pdev, O2_SD_CAPS, 0x73);
@@ -856,7 +856,7 @@ static int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip)
                ret = pci_read_config_byte(chip->pdev,
                                O2_SD_INF_MOD, &scratch);
                if (ret)
-                       return ret;
+                       goto read_fail;
                scratch |= 0x08;
                pci_write_config_byte(chip->pdev, O2_SD_INF_MOD, scratch);
 
@@ -864,7 +864,7 @@ static int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip)
                ret = pci_read_config_byte(chip->pdev,
                                O2_SD_LOCK_WP, &scratch);
                if (ret)
-                       return ret;
+                       goto read_fail;
                scratch |= 0x80;
                pci_write_config_byte(chip->pdev, O2_SD_LOCK_WP, scratch);
                break;
@@ -875,7 +875,7 @@ static int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip)
                ret = pci_read_config_byte(chip->pdev,
                                O2_SD_LOCK_WP, &scratch);
                if (ret)
-                       return ret;
+                       goto read_fail;
 
                scratch &= 0x7f;
                pci_write_config_byte(chip->pdev, O2_SD_LOCK_WP, scratch);
@@ -886,7 +886,7 @@ static int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip)
                                                    O2_SD_FUNC_REG0,
                                                    &scratch_32);
                        if (ret)
-                               return ret;
+                               goto read_fail;
                        scratch_32 = ((scratch_32 & 0xFF000000) >> 24);
 
                        /* Check Whether subId is 0x11 or 0x12 */
@@ -898,7 +898,7 @@ static int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip)
                                                            O2_SD_FUNC_REG4,
                                                            &scratch_32);
                                if (ret)
-                                       return ret;
+                                       goto read_fail;
 
                                /* Enable Base Clk setting change */
                                scratch_32 |= O2_SD_FREG4_ENABLE_CLK_SET;
@@ -921,7 +921,7 @@ static int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip)
                ret = pci_read_config_dword(chip->pdev,
                                            O2_SD_CLK_SETTING, &scratch_32);
                if (ret)
-                       return ret;
+                       goto read_fail;
 
                scratch_32 &= ~(0xFF00);
                scratch_32 |= 0x07E0C800;
@@ -931,14 +931,14 @@ static int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip)
                ret = pci_read_config_dword(chip->pdev,
                                            O2_SD_CLKREQ, &scratch_32);
                if (ret)
-                       return ret;
+                       goto read_fail;
                scratch_32 |= 0x3;
                pci_write_config_dword(chip->pdev, O2_SD_CLKREQ, scratch_32);
 
                ret = pci_read_config_dword(chip->pdev,
                                            O2_SD_PLL_SETTING, &scratch_32);
                if (ret)
-                       return ret;
+                       goto read_fail;
 
                scratch_32 &= ~(0x1F3F070E);
                scratch_32 |= 0x18270106;
@@ -949,7 +949,7 @@ static int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip)
                ret = pci_read_config_dword(chip->pdev,
                                            O2_SD_CAP_REG2, &scratch_32);
                if (ret)
-                       return ret;
+                       goto read_fail;
                scratch_32 &= ~(0xE0);
                pci_write_config_dword(chip->pdev,
                                       O2_SD_CAP_REG2, scratch_32);
@@ -961,7 +961,7 @@ static int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip)
                ret = pci_read_config_byte(chip->pdev,
                                           O2_SD_LOCK_WP, &scratch);
                if (ret)
-                       return ret;
+                       goto read_fail;
                scratch |= 0x80;
                pci_write_config_byte(chip->pdev, O2_SD_LOCK_WP, scratch);
                break;
@@ -971,7 +971,7 @@ static int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip)
                ret = pci_read_config_byte(chip->pdev,
                                O2_SD_LOCK_WP, &scratch);
                if (ret)
-                       return ret;
+                       goto read_fail;
 
                scratch &= 0x7f;
                pci_write_config_byte(chip->pdev, O2_SD_LOCK_WP, scratch);
@@ -979,7 +979,7 @@ static int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip)
                ret = pci_read_config_dword(chip->pdev,
                                            O2_SD_PLL_SETTING, &scratch_32);
                if (ret)
-                       return ret;
+                       goto read_fail;
 
                if ((scratch_32 & 0xff000000) == 0x01000000) {
                        scratch_32 &= 0x0000FFFF;
@@ -998,7 +998,7 @@ static int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip)
                                                    O2_SD_FUNC_REG4,
                                                    &scratch_32);
                        if (ret)
-                               return ret;
+                               goto read_fail;
                        scratch_32 |= (1 << 22);
                        pci_write_config_dword(chip->pdev,
                                               O2_SD_FUNC_REG4, scratch_32);
@@ -1017,7 +1017,7 @@ static int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip)
                ret = pci_read_config_byte(chip->pdev,
                                           O2_SD_LOCK_WP, &scratch);
                if (ret)
-                       return ret;
+                       goto read_fail;
                scratch |= 0x80;
                pci_write_config_byte(chip->pdev, O2_SD_LOCK_WP, scratch);
                break;
@@ -1028,7 +1028,7 @@ static int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip)
                /* UnLock WP */
                ret = pci_read_config_byte(chip->pdev, O2_SD_LOCK_WP, &scratch);
                if (ret)
-                       return ret;
+                       goto read_fail;
                scratch &= 0x7f;
                pci_write_config_byte(chip->pdev, O2_SD_LOCK_WP, scratch);
 
@@ -1057,13 +1057,16 @@ static int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip)
                /* Lock WP */
                ret = pci_read_config_byte(chip->pdev, O2_SD_LOCK_WP, &scratch);
                if (ret)
-                       return ret;
+                       goto read_fail;
                scratch |= 0x80;
                pci_write_config_byte(chip->pdev, O2_SD_LOCK_WP, scratch);
                break;
        }
 
        return 0;
+
+read_fail:
+       return pcibios_err_to_errno(ret);
 }
 
 #ifdef CONFIG_PM_SLEEP