From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 8E37B142E92; Sun, 28 Jul 2024 15:47:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722181635; cv=none; b=rBkGuuGHCwMAaEFJOCrZONNBLewPleVa1zckklXaioAYFHkbsYOESs9i36jP9uwJOtZueYe/+mXNzIDtFgz9oC/MoXFSqRDEW2Sn8Kmm/nXg4q2TastCsHE1PeIZoUP8UKdEkSdh7ycwD24l4nCx9MaVMQB8oVEOlwRpauXrlTM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722181635; c=relaxed/simple; bh=vpCcuT0FkR68ENM0B8uZt+NEuP8mNvg5ybYSh3hTwcY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G0i/416wVzS0rK0/WKvPGv6K1h6YPU3NZOJjxAt5JTN15McV/Zs3CFpsuGmQUyibDvbxi3Lwluxk00MuB2YmnGAq0SfOK32eusAEd4yY8ThVhUIaECJ7kzDn2tkhs5m7CHqCALoQ+84u0tbATUuKyVYvE5bmQaNvdH3PCV/n9A8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BABfx6aH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BABfx6aH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87491C116B1; Sun, 28 Jul 2024 15:47:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722181635; bh=vpCcuT0FkR68ENM0B8uZt+NEuP8mNvg5ybYSh3hTwcY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BABfx6aHRKI/FElZYuEgATg+hT58r9g0ClpUmxBMKBRIn+OTZL0W/cUBZix10++s0 wGdJ2+HiEOjXNw/nBSbRncrmfHH/uy74UtwK1s2Uyg1DUOIzPeoqa5+tPQFhYK7213 5znJQtcCEAw41c1HPYIII17LgvyGfxsM1IkMYKL2nXwSCgTMJzwKsRkY0+stsMgGhz RYt9Ix3DrdX0C9Kh07jKV3BSgFQr8uaoeZ7PjCiW8e1Cj1Rj3mTbsRgNyVTnAitD3r uPElGX9JxeF+w9v8G2ZU0KyCMrAcgeh5HYZecz99AfADbPo4Bq3eIYvuFDeeZQMjJ0 wCyRKjzzsSsAg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ricardo Ribalda , Laurent Pinchart , Sasha Levin , mchehab@kernel.org, linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 15/20] media: uvcvideo: Remove mappings form uvc_device_info Date: Sun, 28 Jul 2024 11:45:13 -0400 Message-ID: <20240728154605.2048490-15-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240728154605.2048490-1-sashal@kernel.org> References: <20240728154605.2048490-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.43 Content-Transfer-Encoding: 8bit From: Ricardo Ribalda [ Upstream commit 8c40efeda94108d65c52038ea82ee83b2fb933e2 ] We do not have any quirk device making us of this. Remove from now. It can be easily reverted later if needed. Signed-off-by: Ricardo Ribalda Reviewed-by: Laurent Pinchart Signed-off-by: Laurent Pinchart Reviewed-by: Ricardo Ribalda Signed-off-by: Sasha Levin --- drivers/media/usb/uvc/uvc_ctrl.c | 27 +-------------------------- drivers/media/usb/uvc/uvcvideo.h | 1 - 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index e59a463c27618..121e7831d774d 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -2621,32 +2621,7 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain, if (!ctrl->initialized) return; - /* - * First check if the device provides a custom mapping for this control, - * used to override standard mappings for non-conformant devices. Don't - * process standard mappings if a custom mapping is found. This - * mechanism doesn't support combining standard and custom mappings for - * a single control. - */ - if (chain->dev->info->mappings) { - bool custom = false; - - for (i = 0; chain->dev->info->mappings[i]; ++i) { - const struct uvc_control_mapping *mapping = - chain->dev->info->mappings[i]; - - if (uvc_entity_match_guid(ctrl->entity, mapping->entity) && - ctrl->info.selector == mapping->selector) { - __uvc_ctrl_add_mapping(chain, ctrl, mapping); - custom = true; - } - } - - if (custom) - return; - } - - /* Process common mappings next. */ + /* Process common mappings. */ for (i = 0; i < ARRAY_SIZE(uvc_ctrl_mappings); ++i) { const struct uvc_control_mapping *mapping = &uvc_ctrl_mappings[i]; diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 88218693f6f0b..06c1a414ea5b2 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -523,7 +523,6 @@ struct uvc_device_info { u32 quirks; u32 meta_format; u16 uvc_version; - const struct uvc_control_mapping **mappings; }; struct uvc_status_streaming { -- 2.43.0