From patchwork Tue Oct 10 07:07:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ond=C5=99ej_Jirman?= X-Patchwork-Id: 150503 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp9744vqb; Tue, 10 Oct 2023 00:08:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGubGF9EVQpgJkvDGfI6GuvPtM/cPwakvgHUGzgTNd1gwxB8RD17gfahh9kvGr0aRv073GW X-Received: by 2002:a05:6808:188d:b0:3ae:1358:fafc with SMTP id bi13-20020a056808188d00b003ae1358fafcmr21667501oib.58.1696921711246; Tue, 10 Oct 2023 00:08:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696921711; cv=none; d=google.com; s=arc-20160816; b=ScxfO0po1EdArEevB5z/WQoKnBndrdx9uVGDAyrAAI68p3yFt5tZ+QLgf9EgM6lSWL D5UStljUS+csexMf4vBWbBSSwOXCtjTccNmx22nQXmcxApfvdBYg5aFb7eBAj8ZY9J/6 x5/1RFY6D8H6H0kLX+SOgxGK5nwtsjPhiCn3JneplRytlnSm2jdow+LsFo2lEG7gaPCh jcDdb5/HRmSnKKLY8TKFa1/vhbnPydNXOd0dQah08/PE/biup+sh6pZh+TD0hOEveCIM XgCTgbTwA7++jubld19RcsYpcyP8SEcoX3K2qiANPCAOyhuBY9N2GL4+FtYGnGHDAV9D nBcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=gNoWUAea96ObIJipoNDABlsh3EOiKN80P51Nz7b3dD4=; fh=T0y6kzMRBJN+GaGW3Dj2j45FLH06gocGyc76UXyhTqA=; b=LHzNH3iwPYJt04NUyEErW631Rq6E1eDQbp92vBB7Al8cAoveRyMebKeFfmibWMcNzr vVLS3GeF9eIuGgEl9zuI/IQ81FTd0njNEongMRZyHAHyfqeAemBlgjexatbJYHXWI4MW tT7wT/LNGZq+EBoSOc4UA66BWa+/O9njkWCvDtG/EIX9AniKIIIO5TguXp/DM5fsvylj 0IQwYdWV8EWYTKfzZrRxwaWJbVnQ3indHjroIA6GOkgWMwoSI0devSmKh3aALJdnx4PO hRT1Ll3zXKlm+YY9wPUhtrVsDMRvL2bjx8f5M3HZAXDYF1c7n0MBWNBDPzleb/L7t0lm vrrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@xff.cz header.s=mail header.b=u9HA17p7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=xff.cz Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id az1-20020a056a02004100b00578a56baebesi8887362pgb.674.2023.10.10.00.08.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 00:08:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@xff.cz header.s=mail header.b=u9HA17p7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=xff.cz Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 3B9CC8024B0A; Tue, 10 Oct 2023 00:08:15 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442364AbjJJHID (ORCPT + 20 others); Tue, 10 Oct 2023 03:08:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377808AbjJJHIB (ORCPT ); Tue, 10 Oct 2023 03:08:01 -0400 Received: from vps.xff.cz (vps.xff.cz [195.181.215.36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10B3A92; Tue, 10 Oct 2023 00:07:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=xff.cz; s=mail; t=1696921675; bh=4lNplERnI6yZsihONwZhR1SOQRzefzq61EbgYbT+Bl4=; h=From:To:Cc:Subject:Date:From; b=u9HA17p7oMjX7AEpQ9GGFvYeQ7rA7lsBRNbzq6/RpIbGCbQ2KQlco8lZ1vw3O/EGP b2BGQhYZEx5gRHcbg2QDf/VgPjNTUaB2+jby10JNMtqUDC5886z2UoC2MA22NHh0B8 UwURBQ4Cf8MkSqwyXU9boo2KWNtYDH/pHBm3FU9A= From: =?utf-8?q?Ond=C5=99ej_Jirman?= To: linux-rockchip@lists.infradead.org Cc: Ondrej Jirman , Jacopo Mondi , Nicholas Roth , Sakari Ailus , Mauro Carvalho Chehab , linux-media@vger.kernel.org (open list:OMNIVISION OV8858 SENSOR DRIVER), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2] media: i2c: ov8858: Don't set fwnode in the driver Date: Tue, 10 Oct 2023 09:07:44 +0200 Message-ID: <20231010070747.1781612-1-megi@xff.cz> MIME-Version: 1.0 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Tue, 10 Oct 2023 00:08:15 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779351380350553306 X-GMAIL-MSGID: 1779351380350553306 From: Ondrej Jirman This makes the driver work with the new check in v4l2_async_register_subdev() that was introduced recently in 6.6-rc1. Without this change, probe fails with: ov8858 1-0036: Detected OV8858 sensor, revision 0xb2 ov8858 1-0036: sub-device fwnode is an endpoint! ov8858 1-0036: v4l2 async register subdev failed ov8858: probe of 1-0036 failed with error -22 This also simplifies the driver a bit. Signed-off-by: Ondrej Jirman Reviewed-by: Jacopo Mondi --- v2: - call fwnode_handle_put earlier to avoid multiple calls to it in error code paths (suggested by Jacopo Mondi) drivers/media/i2c/ov8858.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/media/i2c/ov8858.c b/drivers/media/i2c/ov8858.c index 3af6125a2eee..4d9fd76e2f60 100644 --- a/drivers/media/i2c/ov8858.c +++ b/drivers/media/i2c/ov8858.c @@ -1850,9 +1850,9 @@ static int ov8858_parse_of(struct ov8858 *ov8858) } ret = v4l2_fwnode_endpoint_parse(endpoint, &vep); + fwnode_handle_put(endpoint); if (ret) { dev_err(dev, "Failed to parse endpoint: %d\n", ret); - fwnode_handle_put(endpoint); return ret; } @@ -1864,12 +1864,9 @@ static int ov8858_parse_of(struct ov8858 *ov8858) default: dev_err(dev, "Unsupported number of data lanes %u\n", ov8858->num_lanes); - fwnode_handle_put(endpoint); return -EINVAL; } - ov8858->subdev.fwnode = endpoint; - return 0; } @@ -1913,7 +1910,7 @@ static int ov8858_probe(struct i2c_client *client) ret = ov8858_init_ctrls(ov8858); if (ret) - goto err_put_fwnode; + return ret; sd = &ov8858->subdev; sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS; @@ -1964,8 +1961,6 @@ static int ov8858_probe(struct i2c_client *client) media_entity_cleanup(&sd->entity); err_free_handler: v4l2_ctrl_handler_free(&ov8858->ctrl_handler); -err_put_fwnode: - fwnode_handle_put(ov8858->subdev.fwnode); return ret; } @@ -1978,7 +1973,6 @@ static void ov8858_remove(struct i2c_client *client) v4l2_async_unregister_subdev(sd); media_entity_cleanup(&sd->entity); v4l2_ctrl_handler_free(&ov8858->ctrl_handler); - fwnode_handle_put(ov8858->subdev.fwnode); pm_runtime_disable(&client->dev); if (!pm_runtime_status_suspended(&client->dev))