ASoC: loongson: Simplify with dev_err_probe()

Error handling in probe() can be a bit simpler with dev_err_probe().

Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn>
Link: https://patch.msgid.link/07855aa6c290ec826d63e68b898e7f4afac5e30d.1725844530.git.zhoubinbin@loongson.cn
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/loongson/loongson_card.c b/sound/soc/loongson/loongson_card.c
index d3cd23ddd0279b320b83ad933ed29ced968d4213..f0ed4508f38a4c8d6b4f200a1977d86df9fd9c60 100644 (file)
--- a/sound/soc/loongson/loongson_card.c
+++ b/sound/soc/loongson/loongson_card.c
@@ -176,22 +176,17 @@ static int loongson_asoc_card_probe(struct platform_device *pdev)
        snd_soc_card_set_drvdata(card, ls_priv);
 
        ret = device_property_read_string(dev, "model", &card->name);
-       if (ret) {
-               dev_err(dev, "Error parsing card name: %d\n", ret);
-               return ret;
-       }
+       if (ret)
+               dev_err_probe(dev, ret, "Error parsing card name\n");
+
        ret = device_property_read_u32(dev, "mclk-fs", &ls_priv->mclk_fs);
-       if (ret) {
-               dev_err(dev, "Error parsing mclk-fs: %d\n", ret);
-               return ret;
-       }
+       if (ret)
+               dev_err_probe(dev, ret, "Error parsing mclk-fs\n");
 
-       if (has_acpi_companion(dev))
-               ret = loongson_card_parse_acpi(ls_priv);
-       else
-               ret = loongson_card_parse_of(ls_priv);
-       if (ret < 0)
-               return ret;
+       ret = has_acpi_companion(dev) ? loongson_card_parse_acpi(ls_priv)
+                                     : loongson_card_parse_of(ls_priv);
+       if (ret)
+               dev_err_probe(dev, ret, "Error parsing acpi/of properties\n");
 
        return devm_snd_soc_register_card(dev, card);
 }

diff --git a/sound/soc/loongson/loongson_i2s_pci.c b/sound/soc/loongson/loongson_i2s_pci.c
index e8ea28bc5a5fbd098c0517b3d40027b9949bca55..3872b1d8fce0c7560670a8ddf5e5c135661c5a2b 100644 (file)
--- a/sound/soc/loongson/loongson_i2s_pci.c
+++ b/sound/soc/loongson/loongson_i2s_pci.c
@@ -97,13 +97,12 @@ static int loongson_i2s_pci_probe(struct pci_dev *pdev,
                dev_err(dev, "iomap_regions failed\n");
                return ret;
        }
+
        i2s->reg_base = pcim_iomap_table(pdev)[0];
        i2s->regmap = devm_regmap_init_mmio(dev, i2s->reg_base,
                                            &loongson_i2s_regmap_config);
-       if (IS_ERR(i2s->regmap)) {
-               dev_err(dev, "regmap_init_mmio failed\n");
-               return PTR_ERR(i2s->regmap);
-       }
+       if (IS_ERR(i2s->regmap))
+               dev_err_probe(dev, PTR_ERR(i2s->regmap), "regmap_init_mmio failed\n");
 
        tx_data = &i2s->tx_dma_data;
        rx_data = &i2s->rx_dma_data;
@@ -115,22 +114,16 @@ static int loongson_i2s_pci_probe(struct pci_dev *pdev,
        rx_data->order_addr = i2s->reg_base + LS_I2S_RX_ORDER;
 
        tx_data->irq = fwnode_irq_get_byname(fwnode, "tx");
-       if (tx_data->irq < 0) {
-               dev_err(dev, "dma tx irq invalid\n");
-               return tx_data->irq;
-       }
+       if (tx_data->irq < 0)
+               dev_err_probe(dev, tx_data->irq, "dma tx irq invalid\n");
 
        rx_data->irq = fwnode_irq_get_byname(fwnode, "rx");
-       if (rx_data->irq < 0) {
-               dev_err(dev, "dma rx irq invalid\n");
-               return rx_data->irq;
-       }
+       if (rx_data->irq < 0)
+               dev_err_probe(dev, rx_data->irq, "dma rx irq invalid\n");
 
-       device_property_read_u32(dev, "clock-frequency", &i2s->clk_rate);
-       if (!i2s->clk_rate) {
-               dev_err(dev, "clock-frequency property invalid\n");
-               return -EINVAL;
-       }
+       ret = device_property_read_u32(dev, "clock-frequency", &i2s->clk_rate);
+       if (ret)
+               dev_err_probe(dev, ret, "clock-frequency property invalid\n");
 
        dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));
 
@@ -141,10 +134,8 @@ static int loongson_i2s_pci_probe(struct pci_dev *pdev,
 
        ret = devm_snd_soc_register_component(dev, &loongson_i2s_component,
                                              &loongson_i2s_dai, 1);
-       if (ret) {
-               dev_err(dev, "register DAI failed %d\n", ret);
-               return ret;
-       }
+       if (ret)
+               dev_err_probe(dev, ret, "register DAI failed\n");
 
        return 0;
 }