From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (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 020241EB36; Thu, 7 Aug 2025 12:32:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754569939; cv=none; b=eQG+NSEZ3bdLcPKWlR4qxY9LZYd/S46bP/asDJF4Or/E+uc8eE0ooB0ema+bDlLGOL0cZzJ4q4qqecDNCuPwACE3xV5am2rdkY2FvStdC+8P5zzwly6kd2g4CxxFMkpoSpStfgOfG4u22sNT6Nwave9KFeSuVcp5yGpx1CGe+TA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754569939; c=relaxed/simple; bh=mDLUQyipon3TC8s7Xe5hlhtx/kxMnlzT8INeN44SBME=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=NIhqw8cLTe9KHk96o4DHnMi+Y0lc3lWSDq2Df2+c69OxiAOJf3EH/2Vlg68Y3881UUCbh5rLrL/AwjjRLcojVQnsiOi3lF5m+W6JmbJ8JDXJJ3n+16ln25MnSm/ApJLG6M638YZenQ2k2KGgn6KC/MA7r0WS1XoRmuwOn8ZTsDE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=LACv+uFT; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="LACv+uFT" Received: from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi [81.175.209.231]) by perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id EDCB18FA; Thu, 7 Aug 2025 14:31:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1754569883; bh=mDLUQyipon3TC8s7Xe5hlhtx/kxMnlzT8INeN44SBME=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=LACv+uFTAOqCoVr6y4n8xhP/phvZ2YaIqX4nfPzsq8htw1/33Ig2joQ5o1c7g1TI/ sm6fQdyxttR4+gfZN8u7QpF8EcmmN4qBOEZ1BO6Gpa7oo5sCerPApF06+UQkNeTbXv CoAosKL4r64nC+r6TFuPhQz7Lyc1Gdn1yLFrA/Yc= Date: Thu, 7 Aug 2025 15:31:57 +0300 From: Laurent Pinchart To: Hans Verkuil Cc: Jacopo Mondi , Mauro Carvalho Chehab , Devarsh Thakkar , Benoit Parrot , Hans Verkuil , Mike Isely , Hans de Goede , Parthiban Veerasooran , Christian Gromm , Greg Kroah-Hartman , Alex Shi , Yanteng Si , Dongliang Mu , Jonathan Corbet , Tomasz Figa , Marek Szyprowski , Andy Walls , Michael Tretter , Pengutronix Kernel Team , Bin Liu , Matthias Brugger , AngeloGioacchino Del Regno , Dmitry Osipenko , Thierry Reding , Jonathan Hunter , Mirela Rabulea , Shawn Guo , Sascha Hauer , Fabio Estevam , Kieran Bingham , Michal Simek , Ming Qian , Zhou Peng , Xavier Roumegue , Philipp Zabel , Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Sylwester Nawrocki , Jernej Skrabec , Chen-Yu Tsai , Samuel Holland , Daniel Almeida , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Nas Chung , Jackson Lee , Minghsiu Tsai , Houlong Wei , Andrew-CT Chen , Tiffany Lin , Yunfei Dong , Geert Uytterhoeven , Magnus Damm , Mikhail Ulyanov , Jacob Chen , Ezequiel Garcia , Heiko Stuebner , Detlev Casanova , Krzysztof Kozlowski , Alim Akhtar , Sylwester Nawrocki , =?utf-8?Q?=C5=81ukasz?= Stelmach , Andrzej Pietrasiewicz , Jacek Anaszewski , Andrzej Hajda , Fabien Dessenne , Hugues Fruchet , Jean-Christophe Trotin , Maxime Coquelin , Alexandre Torgue , Nicolas Dufresne , Benjamin Gaignard , Steve Longerbeam , Maxime Ripard , Paul Kocialkowski , Niklas =?utf-8?Q?S=C3=B6derlund?= , Robert Foss , Todor Tomov , Vladimir Zapolskiy , Corentin Labbe , Sakari Ailus , Bingbu Cao , Tianshu Qiu , Stanislaw Gruszka , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-tegra@vger.kernel.org, imx@lists.linux.dev, linux-renesas-soc@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-sunxi@lists.linux.dev, linux-usb@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, mjpeg-users@lists.sourceforge.net Subject: Re: [PATCH 58/65] media: zoran: Remove access to __fh Message-ID: <20250807123157.GF11583@pendragon.ideasonboard.com> References: <20250802-media-private-data-v1-0-eb140ddd6a9d@ideasonboard.com> <20250802-media-private-data-v1-58-eb140ddd6a9d@ideasonboard.com> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: On Thu, Aug 07, 2025 at 08:58:01AM +0200, Hans Verkuil wrote: > On 02/08/2025 11:23, Jacopo Mondi wrote: > > The __fh parameter is assigned to an unsued variable. Remove it > > and remove the unused struct zoran_fh type. > > > > Signed-off-by: Jacopo Mondi > > --- > > drivers/media/pci/zoran/zoran.h | 6 ------ > > drivers/media/pci/zoran/zoran_driver.c | 3 +-- > > 2 files changed, 1 insertion(+), 8 deletions(-) > > > > diff --git a/drivers/media/pci/zoran/zoran.h b/drivers/media/pci/zoran/zoran.h > > index 1cd990468d3de9db8b14b72483972041c57bfee2..d05e222b392156bf1b3b4c83c6591db642c3c377 100644 > > --- a/drivers/media/pci/zoran/zoran.h > > +++ b/drivers/media/pci/zoran/zoran.h > > @@ -154,12 +154,6 @@ struct zoran_jpg_settings { > > > > struct zoran; > > > > -/* zoran_fh contains per-open() settings */ > > -struct zoran_fh { > > - struct v4l2_fh fh; > > - struct zoran *zr; > > -}; > > - > > struct card_info { > > enum card_type type; > > char name[32]; > > diff --git a/drivers/media/pci/zoran/zoran_driver.c b/drivers/media/pci/zoran/zoran_driver.c > > index f42f596d3e6295e31e3b33cd83c5f7243911bd30..ec7fc1da4cc02f5a344cb49bb9a783c41c758195 100644 > > --- a/drivers/media/pci/zoran/zoran_driver.c > > +++ b/drivers/media/pci/zoran/zoran_driver.c > > @@ -511,12 +511,11 @@ static int zoran_s_fmt_vid_cap(struct file *file, void *__fh, > > This driver uses __fh as the name for the second argument of the ioctl > callbacks. Can you take this opportunity to rename it to either 'fh' or 'priv'? It's a bit of yak shaving, but not too difficult so it will be addressed in the next version (Jacopo already wrote the patches, thanks). > Generally it's not a good idea to prefix variables with __ for no good reason. > > Grepping for __fh also shows two other drivers: > > drivers/media/platform/chips-media/coda/coda-common.c:#define fh_to_ctx(__fh) container_of(__fh, struct coda_ctx, fh) > drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h:#define fh_to_ctx(__fh) container_of(__fh, struct s5p_mfc_ctx, fh) > > I think it is a good idea to rename __fh to fh there as well. That can't be done, otherwise things like #define fh_to_ctx(fh) container_of(fh, struct coda_ctx, fh) static inline struct coda_ctx *file_to_ctx(struct file *filp) { return fh_to_ctx(file_to_v4l2_fh(filp)); } will expand in the file_to_ctx() function to return container_of(file_to_v4l2_fh(filp), struct coda_ctx, file_to_v4l2_fh(filp)) We could rename the __fh argument to vfh or v4l2fh, but I think __fh is equally good there. It's just the macro argument name. > > struct v4l2_format *fmt) > > { > > struct zoran *zr = video_drvdata(file); > > - struct zoran_fh *fh = __fh; > > int i; > > int res = 0; > > > > if (fmt->fmt.pix.pixelformat == V4L2_PIX_FMT_MJPEG) > > - return zoran_s_fmt_vid_out(file, fh, fmt); > > + return zoran_s_fmt_vid_out(file, __fh, fmt); > > > > for (i = 0; i < NUM_FORMATS; i++) > > if (fmt->fmt.pix.pixelformat == zoran_formats[i].fourcc) -- Regards, Laurent Pinchart