From patchwork Thu Dec 28 09:39:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hidenori Kobayashi X-Patchwork-Id: 183666 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp1893473dyb; Thu, 28 Dec 2023 01:40:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IGRUgOilMVV0uYIXEFzq51mnI+C9ffqD5ha9ioNAl+YGJWK1c/ErWOAlDNp+5yGT2HxNUjk X-Received: by 2002:a05:6808:1707:b0:3ba:aa7:bd2f with SMTP id bc7-20020a056808170700b003ba0aa7bd2fmr11854242oib.92.1703756409704; Thu, 28 Dec 2023 01:40:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703756409; cv=none; d=google.com; s=arc-20160816; b=Gr8Txoq/EKcfBL3QChpDwFaeIuUZPRUJQH9Y+IF2NeMpMlpT7hccDN7DtNS/LX3WnF uSltxz1uUoj/ewnJh5nL+pHrCHLd5t9IQ2h1LnaQRmBRLQsjmNTIbUE5oakaLVlu6D6V ERTZi4CjHKcXdeaT/PJToIwWnXH2+sUnapHa6iTMrRWkXs08FjjHPBvgRj4nyAlwIV5O jRRituHjr1iAAfYGA3itkWZPVhZyq5owa7jFhLdWdCGOIiGRSdpXIfjWGltQI5CVqQ7O 3K8kXzXUnLpd40l71NMnOu35ipnm+kPjxlvGtAdX7xGzII7oeJGCeka9xCL5NAsTgbxc fo/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=cE0PHPIX9V+Td6mS/CWtPhPTpSAbOD3GNR/J2y9uxsE=; fh=jIO5vXxyawZwCZqkWwwpRws2eigcS5WhitJ+uDvAXxM=; b=sC4tlH5efLVHdnUnzqeSHMBRm5wQzfhWF6pil9MNIuTragitaPRh9nV3hHbpSjEhw1 AbkcwPP5w0a22vfqJNgJ6Iuramz9V0hAE1dh1wPCsUEO0CgAEBcPTMWM5M4wUzpjZYW1 mftSc8EuBt4WQVgGM8Rr/0Ye2ThXC8fcywkkoh9Bg9ORRoz+6uMudUqj5u2DTROClLgg XDDGVVGwNqSR7Ye1WRUwrVbjEYTmUDqjmn3TWKoXFWSvTtSBWinEGYy59V0+Am7hf6IW b5RNi8u1oQ9oO4QidKK1HfaBWygMsri2o075Iv3DcmOdPCxzbTg4/zbosmiV2VKyVNup 4T2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=HGtaXCTW; spf=pass (google.com: domain of linux-kernel+bounces-12538-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-12538-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id q14-20020a631f4e000000b005cdd3a5543bsi7829559pgm.438.2023.12.28.01.40.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Dec 2023 01:40:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-12538-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=HGtaXCTW; spf=pass (google.com: domain of linux-kernel+bounces-12538-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-12538-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 739DD282E41 for ; Thu, 28 Dec 2023 09:40:09 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6C56C6FA4; Thu, 28 Dec 2023 09:39:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="HGtaXCTW" X-Original-To: linux-kernel@vger.kernel.org Received: from mail-oi1-f173.google.com (mail-oi1-f173.google.com [209.85.167.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5C50A63AD for ; Thu, 28 Dec 2023 09:39:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Received: by mail-oi1-f173.google.com with SMTP id 5614622812f47-3bb53e20a43so4742282b6e.1 for ; Thu, 28 Dec 2023 01:39:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1703756388; x=1704361188; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=cE0PHPIX9V+Td6mS/CWtPhPTpSAbOD3GNR/J2y9uxsE=; b=HGtaXCTWSc5xmYeGmFWcNgiFhRBXHHeg4yGCp0vs0GOy4mpHthhwmQ7ejvF3FBs3+r UDEnutDOzcUCoytdQtiTg1EsQmjM7+AT9Ti4HPreWU/UIe1cdmmNtiHkBUoa/GE7kIlK fZtczkp3dDgOm0KScLJspmINHrYqVYpV49ykE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703756388; x=1704361188; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=cE0PHPIX9V+Td6mS/CWtPhPTpSAbOD3GNR/J2y9uxsE=; b=hhjblNQIar//V12AuTwLNgQQ2NkmBPkl8mTtARNBn90UfJMnNLtdBXWaxJtoM/T51v SUgsyBtRESCGyuRF54+xj855U6Kif2uFYvExGbT8/w2DztQEMEiF/Rmy5H4z9tTpSK9s KoyoXv/h6OUextg8yz13dl81JIdUAkOjx7n/njYJ4aWMGYjVRDfCzoGXjrEA9H2bLjwN u87uqLJvmVuvBSMprgib9E2KHpa0WMSfc16T5+w7N2+AeH5pAw6IJXjAuR6n4ONIJ5UL 6AIh49g9eXqBsmuVjWsPWliNxJ4AaOMn9hOLkqf6OSekLMLSzO4dlZpqWDkDRJ84BJ0j o/mA== X-Gm-Message-State: AOJu0YxcCZZ3yCAf3CQwBAv8yq4bOSmcSu92A386hv9xTarJyOaaG+5P eKYxLELWGzeg2ZQ8DdtfpK1liBzmSpP+ X-Received: by 2002:a05:6358:340f:b0:174:dc11:4827 with SMTP id h15-20020a056358340f00b00174dc114827mr5349757rwd.51.1703756388166; Thu, 28 Dec 2023 01:39:48 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:5411:cc6a:8ad4:c73c]) by smtp.gmail.com with ESMTPSA id rs16-20020a17090b2b9000b00286da7407f2sm17910570pjb.7.2023.12.28.01.39.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Dec 2023 01:39:47 -0800 (PST) From: Hidenori Kobayashi To: Sakari Ailus , Bingbu Cao , Tianshu Qiu , Mauro Carvalho Chehab , Greg Kroah-Hartman Cc: Hidenori Kobayashi , linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH] media: staging: ipu3-imgu: Set fields before media_entity_pads_init() Date: Thu, 28 Dec 2023 18:39:25 +0900 Message-ID: <20231228093926.748001-1-hidenorik@chromium.org> X-Mailer: git-send-email 2.43.0.472.g3155946c3a-goog Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786518080726162855 X-GMAIL-MSGID: 1786518080726162855 The pad's flags is checked in media_entity_pads_init(), so it has to be initialized beforehand. The ops initialization is also moved together for readability. Signed-off-by: Hidenori Kobayashi --- drivers/staging/media/ipu3/ipu3-v4l2.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/media/ipu3/ipu3-v4l2.c b/drivers/staging/media/ipu3/ipu3-v4l2.c index a66f034380c0..3df58eb3e882 100644 --- a/drivers/staging/media/ipu3/ipu3-v4l2.c +++ b/drivers/staging/media/ipu3/ipu3-v4l2.c @@ -1069,6 +1069,11 @@ static int imgu_v4l2_subdev_register(struct imgu_device *imgu, struct imgu_media_pipe *imgu_pipe = &imgu->imgu_pipe[pipe]; /* Initialize subdev media entity */ + imgu_sd->subdev.entity.ops = &imgu_media_ops; + for (i = 0; i < IMGU_NODE_NUM; i++) { + imgu_sd->subdev_pads[i].flags = imgu_pipe->nodes[i].output ? + MEDIA_PAD_FL_SINK : MEDIA_PAD_FL_SOURCE; + } r = media_entity_pads_init(&imgu_sd->subdev.entity, IMGU_NODE_NUM, imgu_sd->subdev_pads); if (r) { @@ -1076,11 +1081,6 @@ static int imgu_v4l2_subdev_register(struct imgu_device *imgu, "failed initialize subdev media entity (%d)\n", r); return r; } - imgu_sd->subdev.entity.ops = &imgu_media_ops; - for (i = 0; i < IMGU_NODE_NUM; i++) { - imgu_sd->subdev_pads[i].flags = imgu_pipe->nodes[i].output ? - MEDIA_PAD_FL_SINK : MEDIA_PAD_FL_SOURCE; - } /* Initialize subdev */ v4l2_subdev_init(&imgu_sd->subdev, &imgu_subdev_ops); @@ -1177,15 +1177,15 @@ static int imgu_v4l2_node_setup(struct imgu_device *imgu, unsigned int pipe, } /* Initialize media entities */ + node->vdev_pad.flags = node->output ? + MEDIA_PAD_FL_SOURCE : MEDIA_PAD_FL_SINK; + vdev->entity.ops = NULL; r = media_entity_pads_init(&vdev->entity, 1, &node->vdev_pad); if (r) { dev_err(dev, "failed initialize media entity (%d)\n", r); mutex_destroy(&node->lock); return r; } - node->vdev_pad.flags = node->output ? - MEDIA_PAD_FL_SOURCE : MEDIA_PAD_FL_SINK; - vdev->entity.ops = NULL; /* Initialize vbq */ vbq->type = node->vdev_fmt.type;