From nobody Wed Feb 11 09:40:02 2026 Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (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 753A721C9F8 for ; Mon, 2 Jun 2025 13:06:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748869586; cv=none; b=hamxkD4AB6vetmZvM+RRGN8KvQia7TA4BV7/DTXYJvAPC6WPMatNkaGLIvWlAW/gOqJYsQgIVGGZ0hbuK5DVRCfuAQU36gwle4sYmIbx7jkX6MIKYhcfOspoXShVvsTvkz0VxzLEElN4n1Rbv9uPZYnxkPbNgioxjmYaDysO5Hw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748869586; c=relaxed/simple; bh=B0jNGSufNvPJuCam1LbtuPADRfe/FotYKW4NrWm/oXQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=C/wID6o3F2SH0cWnWkPPF3UkyDGgXKaR69DC1d1EJfJtSC2UTWqOrGxDVlqd+LYaHoLyGS3WUWe++ky73T9xaSKlUbeUfsRfKZu5suTaCf6HXg4AWAbwY3ovbo/o5ZqHmrNB9vkpKAW37EAWGd95lIKTNbwNK9oU3Xe334S8IXY= 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=NFMry7eB; arc=none smtp.client-ip=209.85.167.42 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="NFMry7eB" Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-552206ac67aso4945660e87.2 for ; Mon, 02 Jun 2025 06:06:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1748869582; x=1749474382; 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=ZuqigEavLUIFRcdMGWtAXF6BHoROJfpc2OWkY3rCm9o=; b=NFMry7eB4quU+U/sDxCTUOFwUd9gMeCrCsLaSwOt3jDQxkfe1qna/ZEeruxb95TK92 Q/n57AfXYRka3bOOkGlYEsW5PNHQLLIf+ECF9DRTP+TC9cPDliFT5sF//9MeOFAxsNUm E7AHgabTfrlrrUjcyyzoE8xBGT6EBg0WYgX9I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748869582; x=1749474382; 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=ZuqigEavLUIFRcdMGWtAXF6BHoROJfpc2OWkY3rCm9o=; b=FtgHAN6hZ28CCg2GhQNB+ODDcWiC7N609ADJG8glZF2dbtwKcMJ70ucCT4n71DyQxI FPVEkzpjYq1PfFek7mChA9qEtrF1gyjJXzocQvXVmmgtFduKqIq2dxKAnoEhZBFnGCjH nbh+mq8QEv/y1aBGXE6swcRpyT7A8UKl3y/cHHPvSKDLwVNWvzD/coWLUKtf3OqreH6d Wt+ekVdP7eNeEaOQSOG/skTBHmyiab9uNs/A3bXrBYshivZnkpYKVloPAL5/ad4EgP8m 5abPbXB2k5MrIFSnv2BfU9AQy8bXoRdZIdx7eEB3UZuaUaDRU5tquDzH+tGo0DcsrQ3K TKcQ== X-Forwarded-Encrypted: i=1; AJvYcCVN3bWUHPAvub8+vI9jicRRhzQDYoTlKvGcegEVdVeqrd9Eu/QTpKF07hoSERokCcQ0237XcxbAXmG8sYg=@vger.kernel.org X-Gm-Message-State: AOJu0YzWiPOvVYTI3VSEaZLw7NIhlEb/5eNH65De140qsdxOiBwxLHU+ kygUZEXi5WiOgy2x2LPgWYMiZ5nOGfq2PXm4bROX0FGnO/ipvG2e9KH881ZxYXPk/Q== X-Gm-Gg: ASbGncvwyPi4skzwOhcymdoUEYG+BQHyKABELCeUtFSTOGjN9HvflOwYhWm+FNIXgh+ m7PBK4xwskYW9L+/YCju2fJOwmhgruIjB9EEvtOX+uYFjUDHwx+k5Vuo3Yo5iLoNQPi0VcamE0S k1mqYT64Dd711s5/y9b7+sJGFypXL56g7mIHVMHj3b0jvghsGKVr+zD/0HHMunm8XL1F4ZB8yQD WjP2u72GixOsxqGdXHMeMj4jouyMnB7huDbC4bV6+2aYHG0dcaLyzNDHC5yAS4Ive9cr+sVMPu0 JHD8l1XlcYoAk5tgzVtSLqPo6rsXlw3cY/5rAx1jr+A+UMrRh0UwXrFlVWvbIObqp4hfYnw4ei2 2M7ii+zxXIgsdiIzUPpRhSN3Clw== X-Google-Smtp-Source: AGHT+IHMoONe8Ln9wE6PiwlQI0iQHuL4cC9FaE/WPx3vc4gsLClIVg9hP9Y5j+IWRY92Ncews+799A== X-Received: by 2002:ac2:4c46:0:b0:553:3432:33ac with SMTP id 2adb3069b0e04-5533d1b7683mr4006496e87.43.1748869582193; Mon, 02 Jun 2025 06:06:22 -0700 (PDT) Received: from ribalda.c.googlers.com (90.52.88.34.bc.googleusercontent.com. [34.88.52.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5533787d26esm1590160e87.41.2025.06.02.06.06.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Jun 2025 06:06:20 -0700 (PDT) From: Ricardo Ribalda Date: Mon, 02 Jun 2025 13:06:14 +0000 Subject: [PATCH v2 2/9] media: uvcvideo: Refactor uvc_v4l2_compat_ioctl32 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: <20250602-uvc-grannular-invert-v2-2-c871934ad880@chromium.org> References: <20250602-uvc-grannular-invert-v2-0-c871934ad880@chromium.org> In-Reply-To: <20250602-uvc-grannular-invert-v2-0-c871934ad880@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.2 Declaring a variable for doing automatic cleanup is not a very common pattern. Replace the cleanup macro with manual cleanup to make the code simpler. Suggested-by: Laurent Pinchart Signed-off-by: Ricardo Ribalda Reviewed-by: Laurent Pinchart Link: https://lore.kernel.org/r/20250509-uvc-followup-v1-3-73bcde30d2b5@chr= omium.org Signed-off-by: Laurent Pinchart --- drivers/media/usb/uvc/uvc_v4l2.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v= 4l2.c index 862b4e34e5b629cf324479a9bb59ebe8784ccd5d..1abdf1ea39956bbbadd3f166f37= bdac518068648 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -1382,11 +1382,9 @@ static int uvc_v4l2_put_xu_query(const struct uvc_xu= _control_query *kp, #define UVCIOC_CTRL_MAP32 _IOWR('u', 0x20, struct uvc_xu_control_mapping32) #define UVCIOC_CTRL_QUERY32 _IOWR('u', 0x21, struct uvc_xu_control_query32) =20 -DEFINE_FREE(uvc_pm_put, struct uvc_device *, if (_T) uvc_pm_put(_T)) static long uvc_v4l2_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) { - struct uvc_device *uvc_device __free(uvc_pm_put) =3D NULL; struct uvc_fh *handle =3D file->private_data; union { struct uvc_xu_control_mapping xmap; @@ -1399,38 +1397,38 @@ static long uvc_v4l2_compat_ioctl32(struct file *fi= le, if (ret) return ret; =20 - uvc_device =3D handle->stream->dev; - switch (cmd) { case UVCIOC_CTRL_MAP32: ret =3D uvc_v4l2_get_xu_mapping(&karg.xmap, up); if (ret) - return ret; + break; ret =3D uvc_ioctl_xu_ctrl_map(handle->chain, &karg.xmap); if (ret) - return ret; + break; ret =3D uvc_v4l2_put_xu_mapping(&karg.xmap, up); if (ret) - return ret; - + break; break; =20 case UVCIOC_CTRL_QUERY32: ret =3D uvc_v4l2_get_xu_query(&karg.xqry, up); if (ret) - return ret; + break; ret =3D uvc_xu_ctrl_query(handle->chain, &karg.xqry); if (ret) - return ret; + break; ret =3D uvc_v4l2_put_xu_query(&karg.xqry, up); if (ret) - return ret; + break; break; =20 default: - return -ENOIOCTLCMD; + ret =3D -ENOIOCTLCMD; + break; } =20 + uvc_pm_put(handle->stream->dev); + return ret; } #endif --=20 2.49.0.1266.g31b7d2e469-goog