From patchwork Sun Nov 12 19:56:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 13453395 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 25AAD1864B for ; Sun, 12 Nov 2023 20:21:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="b5jPV3Zp" Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 066822590 for ; Sun, 12 Nov 2023 12:21:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699820502; x=1731356502; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tu+/MQvS/JXWhSIT3ceXyQpbz4NVtKi18iHdsIyVSN4=; b=b5jPV3ZpycbZyEGWbWr+oauRpcTVKxWbZdkpP6efEaBTQX9DqIGlNpeg eXtCbraPd8XatNdgHA6y5O0rxM/BVjeDwR05DlAddPomjzX8cGMpBZlLI hI76q7HzvBtXf31Zl+GLx3+Z0g9uAmbQo7OmmXsWgD1ZhKZ7mr61gJY6t rr0D5qfdu7ODBrq/NB+lgVx1nPLsnPmYawmXQMnMC3UWD/Nugb5ZsclFu y6Q0cb6qE6gkvUNM7KmLUJg0+B1ZrOvCHN2Dd03KuoKLazZkaW3wZUipP 8142mN4u2CLCG/xWJkKZzAN0LMvYAcBPsmllRwrpl+Lk9JipZGOkdXsKL A==; X-IronPort-AV: E=McAfee;i="6600,9927,10892"; a="393217645" X-IronPort-AV: E=Sophos;i="6.03,298,1694761200"; d="scan'208";a="393217645" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Nov 2023 12:21:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10892"; a="764177666" X-IronPort-AV: E=Sophos;i="6.03,298,1694761200"; d="scan'208";a="764177666" Received: from turnipsi.fi.intel.com (HELO kekkonen.fi.intel.com) ([10.237.72.44]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Nov 2023 12:21:39 -0800 Received: from punajuuri.localdomain (punajuuri.localdomain [192.168.240.130]) by kekkonen.fi.intel.com (Postfix) with ESMTP id 752ED120706; Sun, 12 Nov 2023 21:57:13 +0200 (EET) Received: from sailus by punajuuri.localdomain with local (Exim 4.96) (envelope-from ) id 1r2GZl-0045d2-0R; Sun, 12 Nov 2023 21:56:57 +0200 From: Sakari Ailus To: linux-media@vger.kernel.org Cc: hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com, tomi.valkeinen@ideasonboard.com, jacopo.mondi@ideasonboard.com, bingbu.cao@intel.com, hongju.wang@intel.com, Alain Volmat Subject: [PATCH v8 4/9] media: v4l: subdev: v4l2_subdev_state_get_format always returns format now Date: Sun, 12 Nov 2023 21:56:42 +0200 Message-Id: <20231112195647.974904-5-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231112195647.974904-1-sakari.ailus@linux.intel.com> References: <20231112195647.974904-1-sakari.ailus@linux.intel.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Now that v4l2_subdev_state_get_format() always returns format, don't call alternative v4l2_subdev_get_pad_format() anymore. Signed-off-by: Sakari Ailus Reviewed-by: Laurent Pinchart Reviewed-by: Tomi Valkeinen --- drivers/media/v4l2-core/v4l2-subdev.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c index f5ac103cd323..44341f0a8aa2 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c @@ -1580,14 +1580,7 @@ int v4l2_subdev_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_state *state, { struct v4l2_mbus_framefmt *fmt; - if (sd->flags & V4L2_SUBDEV_FL_STREAMS) - fmt = v4l2_subdev_state_get_format(state, format->pad, - format->stream); - else if (format->pad < sd->entity.num_pads && format->stream == 0) - fmt = v4l2_subdev_get_pad_format(sd, state, format->pad); - else - fmt = NULL; - + fmt = v4l2_subdev_state_get_format(state, format->pad, format->stream); if (!fmt) return -EINVAL;