Skip to content

Commit bfb3ddf

Browse files
author
Andi Shyti
committed
i2c: qcom-geni: Use dev_err_probe in the probe function
Replace classical dev_err with dev_err_probe in the probe function for better error reporting. Also, use dev_err_probe in cases where the error number is clear (e.g., -EIO or -EINVAL) to maintain consistency. Additionally, remove redundant logging to simplify the code. Reviewed-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org> Acked-by: Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com> Link: https://lore.kernel.org/r/20241227223230.462395-2-andi.shyti@kernel.org Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
1 parent f8cef98 commit bfb3ddf

1 file changed

Lines changed: 14 additions & 19 deletions

File tree

drivers/i2c/busses/i2c-qcom-geni.c

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -823,11 +823,9 @@ static int geni_i2c_probe(struct platform_device *pdev)
823823
return gi2c->irq;
824824

825825
ret = geni_i2c_clk_map_idx(gi2c);
826-
if (ret) {
827-
dev_err(dev, "Invalid clk frequency %d Hz: %d\n",
828-
gi2c->clk_freq_out, ret);
829-
return ret;
830-
}
826+
if (ret)
827+
return dev_err_probe(dev, ret, "Invalid clk frequency %d Hz\n",
828+
gi2c->clk_freq_out);
831829

832830
gi2c->adap.algo = &geni_i2c_algo;
833831
init_completion(&gi2c->done);
@@ -837,11 +835,10 @@ static int geni_i2c_probe(struct platform_device *pdev)
837835
/* Keep interrupts disabled initially to allow for low-power modes */
838836
ret = devm_request_irq(dev, gi2c->irq, geni_i2c_irq, IRQF_NO_AUTOEN,
839837
dev_name(dev), gi2c);
840-
if (ret) {
841-
dev_err(dev, "Request_irq failed:%d: err:%d\n",
842-
gi2c->irq, ret);
843-
return ret;
844-
}
838+
if (ret)
839+
return dev_err_probe(dev, ret,
840+
"Request_irq failed: %d\n", gi2c->irq);
841+
845842
i2c_set_adapdata(&gi2c->adap, gi2c);
846843
gi2c->adap.dev.parent = dev;
847844
gi2c->adap.dev.of_node = dev->of_node;
@@ -870,16 +867,14 @@ static int geni_i2c_probe(struct platform_device *pdev)
870867

871868
ret = geni_se_resources_on(&gi2c->se);
872869
if (ret) {
873-
dev_err(dev, "Error turning on resources %d\n", ret);
874870
clk_disable_unprepare(gi2c->core_clk);
875-
return ret;
871+
return dev_err_probe(dev, ret, "Error turning on resources\n");
876872
}
877873
proto = geni_se_read_proto(&gi2c->se);
878874
if (proto != GENI_SE_I2C) {
879-
dev_err(dev, "Invalid proto %d\n", proto);
880875
geni_se_resources_off(&gi2c->se);
881876
clk_disable_unprepare(gi2c->core_clk);
882-
return -ENXIO;
877+
return dev_err_probe(dev, -ENXIO, "Invalid proto %d\n", proto);
883878
}
884879

885880
if (desc && desc->no_dma_support)
@@ -894,7 +889,7 @@ static int geni_i2c_probe(struct platform_device *pdev)
894889
if (ret) {
895890
geni_se_resources_off(&gi2c->se);
896891
clk_disable_unprepare(gi2c->core_clk);
897-
return dev_err_probe(dev, ret, "Failed to setup GPI DMA mode\n");
892+
return ret;
898893
}
899894

900895
dev_dbg(dev, "Using GPI DMA mode for I2C\n");
@@ -907,10 +902,10 @@ static int geni_i2c_probe(struct platform_device *pdev)
907902
tx_depth = desc->tx_fifo_depth;
908903

909904
if (!tx_depth) {
910-
dev_err(dev, "Invalid TX FIFO depth\n");
911905
geni_se_resources_off(&gi2c->se);
912906
clk_disable_unprepare(gi2c->core_clk);
913-
return -EINVAL;
907+
return dev_err_probe(dev, -EINVAL,
908+
"Invalid TX FIFO depth\n");
914909
}
915910

916911
gi2c->tx_wm = tx_depth - 1;
@@ -924,7 +919,7 @@ static int geni_i2c_probe(struct platform_device *pdev)
924919
clk_disable_unprepare(gi2c->core_clk);
925920
ret = geni_se_resources_off(&gi2c->se);
926921
if (ret) {
927-
dev_err(dev, "Error turning off resources %d\n", ret);
922+
dev_err_probe(dev, ret, "Error turning off resources\n");
928923
goto err_dma;
929924
}
930925

@@ -940,7 +935,7 @@ static int geni_i2c_probe(struct platform_device *pdev)
940935

941936
ret = i2c_add_adapter(&gi2c->adap);
942937
if (ret) {
943-
dev_err(dev, "Error adding i2c adapter %d\n", ret);
938+
dev_err_probe(dev, ret, "Error adding i2c adapter\n");
944939
pm_runtime_disable(gi2c->se.dev);
945940
goto err_dma;
946941
}

0 commit comments

Comments
 (0)