Skip to content

Commit 07eb014

Browse files
krzkmiquelraynal
authored andcommitted
mtd: rawnand: qcom: Simplify with dev_err_probe()
Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed. Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://lore.kernel.org/linux-mtd/20200901142535.12819-6-krzk@kernel.org
1 parent c4bc1ec commit 07eb014

1 file changed

Lines changed: 8 additions & 16 deletions

File tree

drivers/mtd/nand/raw/qcom_nandc.c

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2702,32 +2702,26 @@ static int qcom_nandc_alloc(struct qcom_nand_controller *nandc)
27022702
if (IS_ERR(nandc->tx_chan)) {
27032703
ret = PTR_ERR(nandc->tx_chan);
27042704
nandc->tx_chan = NULL;
2705-
if (ret != -EPROBE_DEFER)
2706-
dev_err(nandc->dev,
2707-
"tx DMA channel request failed: %d\n",
2708-
ret);
2705+
dev_err_probe(nandc->dev, ret,
2706+
"tx DMA channel request failed\n");
27092707
goto unalloc;
27102708
}
27112709

27122710
nandc->rx_chan = dma_request_chan(nandc->dev, "rx");
27132711
if (IS_ERR(nandc->rx_chan)) {
27142712
ret = PTR_ERR(nandc->rx_chan);
27152713
nandc->rx_chan = NULL;
2716-
if (ret != -EPROBE_DEFER)
2717-
dev_err(nandc->dev,
2718-
"rx DMA channel request failed: %d\n",
2719-
ret);
2714+
dev_err_probe(nandc->dev, ret,
2715+
"rx DMA channel request failed\n");
27202716
goto unalloc;
27212717
}
27222718

27232719
nandc->cmd_chan = dma_request_chan(nandc->dev, "cmd");
27242720
if (IS_ERR(nandc->cmd_chan)) {
27252721
ret = PTR_ERR(nandc->cmd_chan);
27262722
nandc->cmd_chan = NULL;
2727-
if (ret != -EPROBE_DEFER)
2728-
dev_err(nandc->dev,
2729-
"cmd DMA channel request failed: %d\n",
2730-
ret);
2723+
dev_err_probe(nandc->dev, ret,
2724+
"cmd DMA channel request failed\n");
27312725
goto unalloc;
27322726
}
27332727

@@ -2750,10 +2744,8 @@ static int qcom_nandc_alloc(struct qcom_nand_controller *nandc)
27502744
if (IS_ERR(nandc->chan)) {
27512745
ret = PTR_ERR(nandc->chan);
27522746
nandc->chan = NULL;
2753-
if (ret != -EPROBE_DEFER)
2754-
dev_err(nandc->dev,
2755-
"rxtx DMA channel request failed: %d\n",
2756-
ret);
2747+
dev_err_probe(nandc->dev, ret,
2748+
"rxtx DMA channel request failed\n");
27572749
return ret;
27582750
}
27592751
}

0 commit comments

Comments
 (0)