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:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
        Mauro Carvalho Chehab <mchehab@kernel.org>,
        Michal Simek <michal.simek@amd.com>,
        linux-media@vger.kernel.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] media: platform: Use dev_err_probe instead of dev_err
Date:   Wed, 26 Jul 2023 19:51:58 +0800
Message-Id: <20230726115208.5463-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?nNs1UkIJ+lI4KTT7tXg31WaAtkreUjJLfr7RchVp1om1/LrJ3DHWwpjmrRPk?=
 =?us-ascii?Q?3yGmIItKRs2X0/eaiuX4lBPoOT9mwSUjLQLyund8GUjXSSifeqnK0w2Xbhi3?=
 =?us-ascii?Q?LnWt480Re62ayVLB5vdjqZNe26s+UbaNZNnTjREScI75BHvkdynGCY6HEyrM?=
 =?us-ascii?Q?aaIKJrz/mZgF3rKQa8UcvEvPaw7dfxK7AqKfdsPioD+jl5LUtz3vCb3wJSS9?=
 =?us-ascii?Q?JhUX13LstJFeuo5k2A/1PVorLhQ18InVmMxTvrWVMH1IcajDA4xaKD6+jdQq?=
 =?us-ascii?Q?4EfYZ8feudp+HYYa56kswCDAHhm3xDmJ9M2TYtg8nvyWVjj1fexO/xMb0tjG?=
 =?us-ascii?Q?WooKbjtRTnxKj1i1dMDjGvhYBR7prkyrtX+9ZzsA/+MtcTRiuhEb2k0mOkOZ?=
 =?us-ascii?Q?W+0Pm0DX+r1vij1NJ0i5Q4OxGPWRQ1QbjazSGyoZUGHw0Yr0ZuvVjsVWBnc+?=
 =?us-ascii?Q?5640rwfcf6sAnApiww1PdblOtjfe2HD3saJAhLVUqQ6Q7mcY86MKSr195ZPf?=
 =?us-ascii?Q?wC64wXLVXo0KmCfGzBs7MvI15hCZXMb4KUOG3t5ZiFxxiyfARq63UJ+9PblW?=
 =?us-ascii?Q?UaTLsCAQy8VzH0GuB06sI2W6j8D4QEojwG4jQE1lp8BBh1PuEvxUJbBVkM7N?=
 =?us-ascii?Q?jQB2bZZD5tTJ21L91Aj1/6BCTR/TTVmC+ZaH6wUWDytZaJjZEPoq76SdfaW6?=
 =?us-ascii?Q?cWjHIZ8fsirPClBE1niwilX1FaLeChVcOrZMwDzTyN4wWTC4LCSWyOXfCFoR?=
 =?us-ascii?Q?OTprqpHLcA7miKfIhEGMLRzeaorO42lcmiNKIA3g2jfeDRBcXqy0xEnPqi63?=
 =?us-ascii?Q?XwY2bNa+Za67MLwt2/Zh2e56IcWz5nt4rEVT4UNbkSWCjr6Xkiu3lHoTpjkL?=
 =?us-ascii?Q?f6TdKDdaWWjU+1vPEE95af8Z/Fsyz34CM14cetJ1esbUTF4mmvquoxSV1KGx?=
 =?us-ascii?Q?ToMUCw8rrKpCzJhmlMPxCUfZ9zZP6AO58Ct/pntrPxo+0sqgTbTD04ffGN/Z?=
 =?us-ascii?Q?ux/3Sn+EQejtWiFQ96VGvCTpbdyOVXP70FcgxmNJm5L54tY38A6ohQ8ddsmE?=
 =?us-ascii?Q?8nEwVknpAOqMjpw2ULHm/Q2dUkI33p6HwmMK/AlBEOC82BPGMu2JXUFPJHc9?=
 =?us-ascii?Q?lImT3Hs8KLwFXh6juz2oKUnabsmp8lL8CSS2yR0vyVVPp1TeXU10x2WvAjsl?=
 =?us-ascii?Q?rWzYzWxHi2qQWTqZLficzdPaUIlTgsHagyoDEIqSMfyYCms/6nbnSHlBINd0?=
 =?us-ascii?Q?pW87XyPM+oO9GiDHJeQY1Ib2SgDWuWHITRTkdG7J7849I2t7+YbJTR3PLoHT?=
 =?us-ascii?Q?63LyH1Ecdkq+aMgTXxbwP4VB/hKyeXhssnx6GFsOwZt4sFw3ic3wUS32E0ey?=
 =?us-ascii?Q?97DKwGKkuXZhESzvt0LQNdiLSF1HE/2+8NE+SMsXJ3l3W0I/42N65XPAND8u?=
 =?us-ascii?Q?JM8vT4IfwDlH5f01F0O5qf3B/5eCJ30CsQUucd802iFlccB0RuCn484OGC4g?=
 =?us-ascii?Q?dYFcR+dISBL1IGL+ZnGiXOsnp9zHzuw8RbTV2yPuqXgta1RayN4KzYwOpB4X?=
 =?us-ascii?Q?HjXLLgot3ogM/jgtcJ668vKwe3GK2mCkY0HoXv+b?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 800a45f4-6f17-4700-28f1-08db8dcec3ec
X-MS-Exchange-CrossTenant-AuthSource: PS1PR0601MB3737.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2023 11:52:19.5042
 (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: chsKmEitRqSFWTx4sAMje+989Vs1pIl7iT1s4l7YUn4V+UouER5PbgIEEM/ffKYk4FSbM+e7ZUU9x9DxTWwpsQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY0PR06MB4984
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 dma->xdev->dev is not ready yet. In this case,
dev_err(dma->xdev->dev), there will be no output. This patch
fixes the bug.

Signed-off-by: Wang Ming <machel@vivo.com>
---
 drivers/media/platform/xilinx/xilinx-dma.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/media/platform/xilinx/xilinx-dma.c b/drivers/media/platform/xilinx/xilinx-dma.c
index 80d6f5b072ea..16ad39bef6c6 100644
--- a/drivers/media/platform/xilinx/xilinx-dma.c
+++ b/drivers/media/platform/xilinx/xilinx-dma.c
@@ -708,9 +708,8 @@ int xvip_dma_init(struct xvip_composite_device *xdev, struct xvip_dma *dma,
 	snprintf(name, sizeof(name), "port%u", port);
 	dma->dma = dma_request_chan(dma->xdev->dev, name);
 	if (IS_ERR(dma->dma)) {
-		ret = PTR_ERR(dma->dma);
-		if (ret != -EPROBE_DEFER)
-			dev_err(dma->xdev->dev, "no VDMA channel found\n");
+		ret = dev_err_probe(dma->xdev->dev, PTR_ERR(dma->dma),
+			"no VDMA channel found\n");
 		goto error;
 	}
 
-- 
2.25.1