Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Wang Ming <machel@vivo.com>
To:     Mark Brown <broonie@kernel.org>,
        Florian Fainelli <florian.fainelli@broadcom.com>,
        Ray Jui <rjui@broadcom.com>,
        Scott Branden <sbranden@broadcom.com>,
        Broadcom internal kernel review list 
        <bcm-kernel-feedback-list@broadcom.com>, linux-spi@vger.kernel.org,
        linux-rpi-kernel@lists.infradead.org,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Cc:     opensource.kernel@vivo.com, Wang Ming <machel@vivo.com>
Subject: [PATCH v2] spi: Use dev_err_probe instead of dev_err
Date:   Wed, 26 Jul 2023 18:54:47 +0800
Message-Id: <20230726105457.3743-1-machel@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ODlC68Hw+EqQ2A43kFACOGZJErcxyEdRRNc9Ziu7Tid7fzY8uTVbX3fFWjnw?=
 =?us-ascii?Q?rx7lPHum5l+8+MOkfo4S1UxXcqIWiOt69egBCW2jTR8ZIIYnTEp4BS3HXRtQ?=
 =?us-ascii?Q?yUOofCENzojRz4XLeURBiSKB2QFAyS+TIrxY/SK2PRWAxA+B55lNegmXoPA9?=
 =?us-ascii?Q?IVb4PilihsN3z2lyLsKjuIFIehFBhqdjlCxVflL64zzBeQ9HhckCrUyFivov?=
 =?us-ascii?Q?bEF+q2vs/1Nm8zf/bf62S8nZJ19IF/sDMlJG5sRnM8fOUgMhECsAbA6JCunh?=
 =?us-ascii?Q?3hzclbxuawJrFY5HcMlrcLoPNISH/RYRWVPn9NzTtCtPO6b+QGqDodcalzzg?=
 =?us-ascii?Q?Ge7FyN1DsM8nGbA24scszqEJ2+/MHcC9hpaJZUA6+dcNy/Pr8PUvhJz4M63C?=
 =?us-ascii?Q?rtajZ8WHB7iN885OSD9+w3CnKOwagw9sNOfEoRZkhP5GF/g33FrrS3GO6aFT?=
 =?us-ascii?Q?CDhFmxpyO+1VAvbFnpxF62eCnmaClF4kAPC1oE0DxYJ6SvRv/cc685ZNFSBD?=
 =?us-ascii?Q?hidB8+h7MA27E2Ip5vwx5cJBca1F0KnZyyTKlKrup9bMRU0letkrZNopkrBf?=
 =?us-ascii?Q?GbD2pseWuYV5IYu1fLDwFFL43ln1gvBw/ViHR5Fbql718DFIkSV6ie672et2?=
 =?us-ascii?Q?E8kz9OrxM7qzoxl9UZwGBB/VvBhuCD8bUXPf+A/Z5Ae/uNlAqFCwKV4gDKPK?=
 =?us-ascii?Q?Po3R9uDjRwnG5xgWwAM/q5SoMwRBmsXltbp61tBptX3p4s5RXic5/oFM/QAG?=
 =?us-ascii?Q?mzuwWKIXSnD4IVW1mvHReTwCRm6eHtXbZ5AH6RaYj0lOQluLPrB7Q5dwo48M?=
 =?us-ascii?Q?Wwq8TgR2vugOKDdYO1e45hIX0bBBqLpAaVwysEBzPfahEu9AW87U1/SdfswO?=
 =?us-ascii?Q?UdUlcG13VrrIdkdalTpJ3lADsgJgeLnciz0N1aBB9oYyvCxhTlf2l0Jc56a5?=
 =?us-ascii?Q?LfLck3LHoibm9Ii+2DBLfawP8OCInDnt3ilmF8wo3QX+NUqSu6Z8ZFNd65Cy?=
 =?us-ascii?Q?m479CbM2cqNJ2wGvMlOCv4iEpuchl525FqRPvgEdITY7PVT8V13StwOmW9nt?=
 =?us-ascii?Q?ApZ0rvfWXWPNNIPn36wwzdFH688Gykw27Nvs9w/Ji+3jl0uzMLHR+NH0Oan/?=
 =?us-ascii?Q?AP8bTGHS+jmv26zbZSYKnVvSsywhw45L34XZcpl6k4XxtVdyeVxZSojvdcRq?=
 =?us-ascii?Q?C0mcSMqQ1hsu+obVSxK4t5UmLSaOgUiQAXLUbW9s4OL8xrlmo55RfP0cfr2e?=
 =?us-ascii?Q?FFmMEdqgFk0b43PiCtnBhP+xJmnPMOGYIGcmuRon5LB1xpHQ43DxDL3caDPQ?=
 =?us-ascii?Q?zZx25xpjjb3DapXQeeRq621nGWaGuUntKeHVKHznb0mek2vaHm4bokV+OEXh?=
 =?us-ascii?Q?vVYQ6b05/3piO+JU8T4Kakrd5UUcoV2c6YoaHMvV4IdRNSL9wD8YMcSmbLRG?=
 =?us-ascii?Q?gFjVIJDvj1LgSkMVWpndNT3pLmuy3/Ha12iiMK9oPKzpB9GCnTvvMVXzheAs?=
 =?us-ascii?Q?GKsgrxd69b/Brk9HWP61ztY8G7AdSFQTYkwx39hOL9miuY2eWoTd+/cUdiN1?=
 =?us-ascii?Q?OSr0cqJCItwKcRCJ+Z1fhTzGU8jU343+KfL9WjCL?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: bca18843-d94b-45fc-2edd-08db8dc7101d
X-MS-Exchange-CrossTenant-AuthSource: PS1PR0601MB3737.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2023 10:57:11.3568
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: VZErqLtdI1VM/0JgJtdvD52S/OVSr0lzZlybb6SZji+owxDTZBAQPp59jzB/12fR1OwoG4gmHAyycoGPLjNbKw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB4161
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

It is possible that dma_request_chan will return EPROBE_DEFER,
which means that dev is not ready yet. In this case,
dev_err(dev), there will be no output. This patch fixes the bug.

Signed-off-by: Wang Ming <machel@vivo.com>
---
 drivers/spi/spi-bcm2835.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c
index 3b253da98c05..cbf025054c96 100644
--- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c
@@ -903,15 +903,15 @@ static int bcm2835_dma_init(struct spi_controller *ctlr, struct device *dev,
 	/* get tx/rx dma */
 	ctlr->dma_tx = dma_request_chan(dev, "tx");
 	if (IS_ERR(ctlr->dma_tx)) {
-		dev_err(dev, "no tx-dma configuration found - not using dma mode\n");
-		ret = PTR_ERR(ctlr->dma_tx);
+		ret = dev_err_probe(dev, PTR_ERR(ctlr->dma_tx),
+			"no tx-dma configuration found - not using dma mode\n");
 		ctlr->dma_tx = NULL;
 		goto err;
 	}
 	ctlr->dma_rx = dma_request_chan(dev, "rx");
 	if (IS_ERR(ctlr->dma_rx)) {
-		dev_err(dev, "no rx-dma configuration found - not using dma mode\n");
-		ret = PTR_ERR(ctlr->dma_rx);
+		ret = dev_err_probe(dev, PTR_ERR(ctlr->dma_rx),
+			"no rx-dma configuration found - not using dma mode\n");
 		ctlr->dma_rx = NULL;
 		goto err_release;
 	}
-- 
2.25.1