From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (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 4D5BD48BD5A for ; Mon, 18 May 2026 16:43:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779122611; cv=none; b=idmM6cjTXcyJYp4cClRDPKUVRyG+S9nNTKIyHKTOJY5+8IkYF5LmKZmCVoWbg8XAFYsq03W/hrV3x4xhES3Dujd/766q24EyWcowzwENOeZ2tYifMjUxdzyYOcU0seJjFSlhVum/Zw3P+PzPpb6Fu9K4+gU4bX6gELz0HHOgT6E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779122611; c=relaxed/simple; bh=zhExZ6jqddbTF56Sl35o4UWVsHUYK5hkbuh2d+JAPms=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=d1K1XhuMkgip9mnCHTAwpeu0Bd4GhCvY++vIit7bR1aBvVzayn3ukv+oRT2CR4/DA7W/93b/49cMXsSwPlbZLsCCfiS8t562CDxxrs1soR2iu8PaJycC0ge9VfqA5XTAxvTi4mVjtO1jx5OnLLWOaGjqC5R9KrroYaza6V/o1Vs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=BZl1FIZW; arc=none smtp.client-ip=198.175.65.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="BZl1FIZW" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1779122611; x=1810658611; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zhExZ6jqddbTF56Sl35o4UWVsHUYK5hkbuh2d+JAPms=; b=BZl1FIZWBHYc1blYD51j9sQUtZMkBkCY9Ug/y6SIo5N8p06rbp3WKRuc Rbk21iCmjCLMhLs1B0wnPiJN6s3Iyd/8MpvSlp7tXyhEsP1L6Nm9q2Uk4 SDsWXvQIasQrnWDpr14gF8d0nsY0OHKAuukzLDP8etvuW+pvxHgU09b8F 40YxoTJcV2pNaEEkC4B/+hl+NZ7YFsbEAp6KwjM9Dqa/qEHqi2Uc8WxgN 21Uhp9dgSxD+8iXxCy4+xsMOx0z/rASGz6hQg1dHBrhRDbesMA418ajke eid/0fyy+wFtrJvnYHx9/YdggaCMOMu+/BsfQt4bJ+OcnhPDmhj9kgTcC g==; X-CSE-ConnectionGUID: QFEZ4IksRsq1PAZ7vTJ9fA== X-CSE-MsgGUID: 7QV21X3TSp+Q75MIdfc+gw== X-IronPort-AV: E=McAfee;i="6800,10657,11790"; a="97413850" X-IronPort-AV: E=Sophos;i="6.23,242,1770624000"; d="scan'208";a="97413850" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 May 2026 09:43:29 -0700 X-CSE-ConnectionGUID: VU1InKynTlSs064QJrjgaw== X-CSE-MsgGUID: CeGrMxZlSZmbZdTAE/2Hbg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,242,1770624000"; d="scan'208";a="235019223" Received: from mkosciow-mobl1.ger.corp.intel.com (HELO kekkonen.fi.intel.com) ([10.245.244.125]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 May 2026 09:43:24 -0700 Received: from punajuuri.localdomain (unknown [192.168.240.130]) by kekkonen.fi.intel.com (Postfix) with ESMTP id 3E8D7121CFC; Mon, 18 May 2026 19:43:19 +0300 (EEST) Received: from sailus by punajuuri.localdomain with local (Exim 4.98.2) (envelope-from ) id 1wP13m-0000000E8AB-0oEO; Mon, 18 May 2026 19:43:18 +0300 Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs, Bertel Jungin Aukio 5, 02600 Espoo From: Sakari Ailus To: linux-media@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com, Dave Stevenson , Jacopo Mondi , Tomi Valkeinen , Jai Luthra , Mehdi Djait , Frank Li Subject: [PATCH v2 09/17] media: bcm2835-unicam: Use v4l2_subdev_get_frame_desc() Date: Mon, 18 May 2026 19:43:09 +0300 Message-ID: <20260518164318.3367888-10-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260518164318.3367888-1-sakari.ailus@linux.intel.com> References: <20260518164318.3367888-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 Content-Transfer-Encoding: 8bit Call v4l2_subdev_get_frame_desc() to obtain the frame descriptor. This is preferred over calling the get_frame_desc() pad operation directly. Signed-off-by: Sakari Ailus --- .../media/platform/broadcom/bcm2835-unicam.c | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/media/platform/broadcom/bcm2835-unicam.c b/drivers/media/platform/broadcom/bcm2835-unicam.c index 8d28ba0b59a3..7e299ebf3470 100644 --- a/drivers/media/platform/broadcom/bcm2835-unicam.c +++ b/drivers/media/platform/broadcom/bcm2835-unicam.c @@ -27,6 +27,7 @@ * output interface and V4L2 subdevice driver. */ +#include #include #include #include @@ -888,7 +889,6 @@ static int unicam_get_image_vc_dt(struct unicam_device *unicam, struct v4l2_subdev_state *state, u8 *vc, u8 *dt) { - struct v4l2_mbus_frame_desc fd; u32 stream; int ret; @@ -898,17 +898,15 @@ static int unicam_get_image_vc_dt(struct unicam_device *unicam, if (ret) return ret; - ret = v4l2_subdev_call(unicam->sensor.subdev, pad, get_frame_desc, - unicam->sensor.pad->index, &fd); - if (ret) - return ret; - - /* Only CSI-2 supports DTs. */ - if (fd.type != V4L2_MBUS_FRAME_DESC_TYPE_CSI2) - return -EINVAL; + struct v4l2_mbus_frame_desc *fd __free(v4l2_subdev_free_frame_desc) = + v4l2_subdev_get_frame_desc(unicam->sensor.subdev, + unicam->sensor.pad->index, + V4L2_MBUS_FRAME_DESC_TYPE_CSI2); + if (IS_ERR(fd)) + return PTR_ERR(fd); - for (unsigned int i = 0; i < fd.num_entries; ++i) { - const struct v4l2_mbus_frame_desc_entry *fde = &fd.entry[i]; + for (unsigned int i = 0; i < fd->num_entries; ++i) { + const struct v4l2_mbus_frame_desc_entry *fde = &fd->entry[i]; if (fde->stream == stream) { *vc = fde->bus.csi2.vc; @@ -927,7 +925,7 @@ static void unicam_start_rx(struct unicam_device *unicam, const struct unicam_format_info *fmtinfo; const struct v4l2_mbus_framefmt *fmt; unsigned int line_int_freq; - u8 vc, dt; + u8 vc = 0, dt = 0; u32 val; int ret; -- 2.47.3