From: Laurent Pinchart Date: Sun, 10 Aug 2025 01:29:46 +0000 (+0300) Subject: media: usb: hdpvr: Store v4l2_fh pointer in file->private_data X-Git-Tag: v6.18-rc1~133^2~434 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b22ac2e4a96bcf63ecfa0b786f75d0173c8808de;p=thirdparty%2Fkernel%2Flinux.git media: usb: hdpvr: Store v4l2_fh pointer in file->private_data Most V4L2 drivers store the v4l2_fh pointer in file->private_data. The hdpvr driver instead stores the pointer to the driver-specific structure that embeds the v4l2_fh. Switch to storing the v4l2_fh pointer itself to standardize behaviour across drivers. This also prepares for future refactoring that depends on v4l2_fh being stored in private_data. No extensive driver refactoring is required, as file->private_data is only used to check if a file handle is the owner of the device by comparing pointer values. The private_data pointer is actually compared to a struct v4l2_fh pointer, which happens to be the first field of the hdpvr_fh structure. Signed-off-by: Laurent Pinchart Signed-off-by: Hans Verkuil --- diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c index fd7d2a9d0449a..4c431bd9b5035 100644 --- a/drivers/media/usb/hdpvr/hdpvr-video.c +++ b/drivers/media/usb/hdpvr/hdpvr-video.c @@ -381,7 +381,7 @@ static int hdpvr_open(struct file *file) fh->legacy_mode = true; v4l2_fh_init(&fh->fh, video_devdata(file)); v4l2_fh_add(&fh->fh); - file->private_data = fh; + file->private_data = &fh->fh; return 0; }