Skip to content

Commit 5e6f78c

Browse files
Tang Binbroonie
authored andcommitted
ASoC: loongson: Add the correct judgement return
Use the function dev_err_probe can simplify code, but the error return should not be deleted, that is unreasonable, thus fix it. Fixes: 3d2528d ("ASoC: loongson: Simplify with dev_err_probe()") Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com> Link: https://patch.msgid.link/20240910021104.3400-1-tangbin@cmss.chinamobile.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 86a7f45 commit 5e6f78c

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

sound/soc/loongson/loongson_card.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,16 +184,16 @@ static int loongson_asoc_card_probe(struct platform_device *pdev)
184184

185185
ret = device_property_read_string(dev, "model", &card->name);
186186
if (ret)
187-
dev_err_probe(dev, ret, "Error parsing card name\n");
187+
return dev_err_probe(dev, ret, "Error parsing card name\n");
188188

189189
ret = device_property_read_u32(dev, "mclk-fs", &ls_priv->mclk_fs);
190190
if (ret)
191-
dev_err_probe(dev, ret, "Error parsing mclk-fs\n");
191+
return dev_err_probe(dev, ret, "Error parsing mclk-fs\n");
192192

193193
ret = has_acpi_companion(dev) ? loongson_card_parse_acpi(ls_priv)
194194
: loongson_card_parse_of(ls_priv);
195195
if (ret)
196-
dev_err_probe(dev, ret, "Error parsing acpi/of properties\n");
196+
return dev_err_probe(dev, ret, "Error parsing acpi/of properties\n");
197197

198198
return devm_snd_soc_register_card(dev, card);
199199
}

sound/soc/loongson/loongson_i2s_pci.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ static int loongson_i2s_pci_probe(struct pci_dev *pdev,
102102
i2s->regmap = devm_regmap_init_mmio(dev, i2s->reg_base,
103103
&loongson_i2s_regmap_config);
104104
if (IS_ERR(i2s->regmap))
105-
dev_err_probe(dev, PTR_ERR(i2s->regmap), "regmap_init_mmio failed\n");
105+
return dev_err_probe(dev, PTR_ERR(i2s->regmap), "regmap_init_mmio failed\n");
106106

107107
tx_data = &i2s->tx_dma_data;
108108
rx_data = &i2s->rx_dma_data;
@@ -115,15 +115,15 @@ static int loongson_i2s_pci_probe(struct pci_dev *pdev,
115115

116116
tx_data->irq = fwnode_irq_get_byname(fwnode, "tx");
117117
if (tx_data->irq < 0)
118-
dev_err_probe(dev, tx_data->irq, "dma tx irq invalid\n");
118+
return dev_err_probe(dev, tx_data->irq, "dma tx irq invalid\n");
119119

120120
rx_data->irq = fwnode_irq_get_byname(fwnode, "rx");
121121
if (rx_data->irq < 0)
122-
dev_err_probe(dev, rx_data->irq, "dma rx irq invalid\n");
122+
return dev_err_probe(dev, rx_data->irq, "dma rx irq invalid\n");
123123

124124
ret = device_property_read_u32(dev, "clock-frequency", &i2s->clk_rate);
125125
if (ret)
126-
dev_err_probe(dev, ret, "clock-frequency property invalid\n");
126+
return dev_err_probe(dev, ret, "clock-frequency property invalid\n");
127127

128128
dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));
129129

@@ -135,7 +135,7 @@ static int loongson_i2s_pci_probe(struct pci_dev *pdev,
135135
ret = devm_snd_soc_register_component(dev, &loongson_i2s_component,
136136
&loongson_i2s_dai, 1);
137137
if (ret)
138-
dev_err_probe(dev, ret, "register DAI failed\n");
138+
return dev_err_probe(dev, ret, "register DAI failed\n");
139139

140140
return 0;
141141
}

0 commit comments

Comments
 (0)