From nobody Fri Dec 19 20:33:15 2025 Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) (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 8950315444D for ; Mon, 10 Jun 2024 23:10:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718061004; cv=none; b=fC1URtbYSxVS5XzALfwkpM3hrfb3KY2ByJC5pdBXMvDUckJH4F2Pt+MqHRRhDa+YCyzq/QYkoYN94RfV/MZ+Hbg2RPEIGqmVdpf1bOez4reFPF8WUDxYji1+Y+y7Yf58OMSyBzUEkL/GKKtRsdyP19VpwK2ohXbWIycg67BPjLI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718061004; c=relaxed/simple; bh=+r2Q25v4QtfWRynLyRqPbgCpgtuh54ubGSY1KEdbNko=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bNwvloxp9pHUGRiR2piUb9XtI3+bgNaSSRf50PlONDMqDyA1E4qa+fMJVI+94L0a+rUxPsP0efh2c+MTyQIYgOtkuLe9PlZhpMu2YYMamvGxhS9RwTLKftec21lBwljvYDXfFIdVInbdOn5lulkuXKb/HWqZP3pqENNST6T+zkA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=U26le7M2; arc=none smtp.client-ip=209.85.219.45 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="U26le7M2" Received: by mail-qv1-f45.google.com with SMTP id 6a1803df08f44-6b08d661dbaso230326d6.0 for ; Mon, 10 Jun 2024 16:10:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1718061001; x=1718665801; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Er/qUnS8MdBJtpjo7BWYHXnD96tca0yCRfZOovxm8nw=; b=U26le7M204F4uxJv1Q80Ygo74iSqbHJkvY7VbNyuULhMZCDOZDrAa5ljLd6G1qf1ZH jn7ZzWOKsZLChSBHgCwPoaEAEt5m2f5Dl1ND6Q75ESFdcbJl8u6SrR68kbHuPb63dO7F i16m/ODeXqLKL7SGtvKpJwrhNz7K/YBkiA+hM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718061001; x=1718665801; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Er/qUnS8MdBJtpjo7BWYHXnD96tca0yCRfZOovxm8nw=; b=ClhDQR+weRTlgSzgF7rm2EwXazeRs9IdIE2+8ZMPLCk/SbKQG4CI71G5b98O9gaIbS pVsoZ46KqC+wS8uoyst+8wM+oMmKsQv0/AdkUPiTmD8T6WD3ks+y4To6YCDvoOUrjv2p NPLyof/wbAusAQPU6VqWkYvoxVjJTi+YwI129XEHHTBXIRRTprrhdMNyxvuA1105A6AT 3rgzxP4sqcUOPkufFgB5ZUqgazWgJfCMmBHEdlcL4eIYjbC/j5Rf5f4GyOQpisWQgmGX s+M0/QWX8ZH0S6WqZaClaniS4gc+AeHYS7bcJ85N5nA57pkzQ83rsQmS7HXZz2awvn/i ZQog== X-Forwarded-Encrypted: i=1; AJvYcCX4p6zOQOwi28mLAUdtJNj+/kKRhFk4mRxtaqxoYy9NZMv5z0pvkHV1QEzHexp7735cfOrcDnkYAc15adghOGX6LbJfZBi0BGe+Po0v X-Gm-Message-State: AOJu0YysYQJ3XMFDWlnoISl2zIr0Fp7ddK/5/OWHvVvOMXOD+aC48BTI n4O+QFc0jNpgCAK55jpk23WcccsZ/Xn4OSXdmqxzuAOTut0lo4j/zdj7DEPFQgiljBCXOvlJ/tz mkan9 X-Google-Smtp-Source: AGHT+IGGVcUXF3Q+TzeoBW1dpWSX4RCelVgPbdr7LwKtNneYSQiKMiE+ovxL9rBTwMEOW02U5O75Aw== X-Received: by 2002:ad4:5747:0:b0:6ab:9214:ffd3 with SMTP id 6a1803df08f44-6b089f75071mr21382306d6.25.1718061001474; Mon, 10 Jun 2024 16:10:01 -0700 (PDT) Received: from denia.c.googlers.com (123.178.145.34.bc.googleusercontent.com. [34.145.178.123]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b06519d521sm35256946d6.65.2024.06.10.16.10.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jun 2024 16:10:00 -0700 (PDT) From: Ricardo Ribalda Date: Mon, 10 Jun 2024 23:09:57 +0000 Subject: [PATCH v2 6/7] media: uvcvideo: Remove mappings form uvc_device_info Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240610-billion-v2-6-38e861475f85@chromium.org> References: <20240610-billion-v2-0-38e861475f85@chromium.org> In-Reply-To: <20240610-billion-v2-0-38e861475f85@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab Cc: Sergey Senozhatsky , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.12.4 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 --- 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_c= trl.c index d74019cb27fe..1c1710e3c486 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -2679,32 +2679,7 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chai= n *chain, if (!ctrl->initialized) return; =20 - /* - * 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 =3D false; - - for (i =3D 0; chain->dev->info->mappings[i]; ++i) { - const struct uvc_control_mapping *mapping =3D - chain->dev->info->mappings[i]; - - if (uvc_entity_match_guid(ctrl->entity, mapping->entity) && - ctrl->info.selector =3D=3D mapping->selector) { - __uvc_ctrl_add_mapping(chain, ctrl, mapping); - custom =3D true; - } - } - - if (custom) - return; - } - - /* Process common mappings next. */ + /* Process common mappings. */ for (i =3D 0; i < ARRAY_SIZE(uvc_ctrl_mappings); ++i) { const struct uvc_control_mapping *mapping =3D &uvc_ctrl_mappings[i]; =20 diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvi= deo.h index 4df02a40c74f..ff9545dcf716 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -527,7 +527,6 @@ struct uvc_device_info { u32 quirks; u32 meta_format; u16 uvc_version; - const struct uvc_control_mapping **mappings; }; =20 struct uvc_status_streaming { --=20 2.45.2.505.gda0bf45e8d-goog