media: v4l2: Rename second ioctl handlers argument to 'void *priv'

tjh.dev / kernel

fork atom

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

media: v4l2: Rename second ioctl handlers argument to 'void *priv'

The second argument to the ioctl handlers is not a file handle any more.
The standard practice is to name it 'void *priv' in drivers. Many
drivers still name it 'void *fh', and a few use more exotic names.
Replace those more exotic names with 'void *priv' in all media drivers.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Jai Luthra <jai.luthra@linux.dev>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

authored by

Laurent Pinchart and committed by

Hans Verkuil 8 months ago 5396f5ae 9d05191c

+113 -113

18 changed files

expand all collapse all

drivers

media

cec

usb

extron-da-hd-4k-plus

extron-da-hd-4k-plus.c

pci

bt8xx

bttv-driver.c

bttv-vbi.c

cobalt

cobalt-v4l2.c

saa7134

saa7134-video.c

platform

rockchip

rga

rga.c

samsung

s5p-g2d

g2d.c

s5p-mfc

s5p_mfc_dec.c

s5p_mfc_enc.c

stm32

dma2d

dma2d.c

sunxi

sun6i-csi

sun6i_csi_capture.c

synopsys

hdmirx

snps_hdmirx.c

j721e-csi2rx

j721e-csi2rx.c

omap

omap_vout.c

radio

si4713

radio-platform-si4713.c

usb

cx231xx

cx231xx-417.c

gspca

gspca.c

hdpvr

hdpvr-video.c

+2 -2

drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c

reviewed

··· 1252 1252 return o ? -EINVAL : 0; 1253 1253 } 1254 1254 1255 1255 - static int extron_g_edid(struct file *file, void *_fh, 1255 1255 + static int extron_g_edid(struct file *file, void *priv, 1256 1256 struct v4l2_edid *edid) 1257 1257 { 1258 1258 struct extron_port *port = video_drvdata(file); ··· 1280 1280 return 0; 1281 1281 } 1282 1282 1283 1283 - static int extron_s_edid(struct file *file, void *_fh, struct v4l2_edid *edid) 1283 1283 + static int extron_s_edid(struct file *file, void *priv, struct v4l2_edid *edid) 1284 1284 { 1285 1285 struct extron_port *port = video_drvdata(file); 1286 1286

+7 -7

drivers/media/pci/bt8xx/bttv-driver.c

reviewed

··· 1620 1620 return 0; 1621 1621 } 1622 1622 1623 1623 - static int bttv_querystd(struct file *file, void *f, v4l2_std_id *id) 1623 1623 + static int bttv_querystd(struct file *file, void *priv, v4l2_std_id *id) 1624 1624 { 1625 1625 struct bttv *btv = video_drvdata(file); 1626 1626 ··· 1750 1750 return 0; 1751 1751 } 1752 1752 1753 1753 - static int bttv_log_status(struct file *file, void *f) 1753 1753 + static int bttv_log_status(struct file *file, void *priv) 1754 1754 { 1755 1755 struct video_device *vdev = video_devdata(file); 1756 1756 struct bttv *btv = video_drvdata(file); ··· 1761 1761 } 1762 1762 1763 1763 #ifdef CONFIG_VIDEO_ADV_DEBUG 1764 1764 - static int bttv_g_register(struct file *file, void *f, 1764 1764 + static int bttv_g_register(struct file *file, void *priv, 1765 1765 struct v4l2_dbg_register *reg) 1766 1766 { 1767 1767 struct bttv *btv = video_drvdata(file); ··· 1774 1774 return 0; 1775 1775 } 1776 1776 1777 1777 - static int bttv_s_register(struct file *file, void *f, 1777 1777 + static int bttv_s_register(struct file *file, void *priv, 1778 1778 const struct v4l2_dbg_register *reg) 1779 1779 { 1780 1780 struct bttv *btv = video_drvdata(file); ··· 2159 2159 return 0; 2160 2160 } 2161 2161 2162 2162 - static int bttv_g_parm(struct file *file, void *f, 2162 2162 + static int bttv_g_parm(struct file *file, void *priv, 2163 2163 struct v4l2_streamparm *parm) 2164 2164 { 2165 2165 struct bttv *btv = video_drvdata(file); ··· 2208 2208 return 0; 2209 2209 } 2210 2210 2211 2211 - static int bttv_g_selection(struct file *file, void *f, struct v4l2_selection *sel) 2211 2211 + static int bttv_g_selection(struct file *file, void *priv, struct v4l2_selection *sel) 2212 2212 { 2213 2213 struct bttv *btv = video_drvdata(file); 2214 2214 ··· 2232 2232 return 0; 2233 2233 } 2234 2234 2235 2235 - static int bttv_s_selection(struct file *file, void *f, struct v4l2_selection *sel) 2235 2235 + static int bttv_s_selection(struct file *file, void *priv, struct v4l2_selection *sel) 2236 2236 { 2237 2237 struct bttv *btv = video_drvdata(file); 2238 2238 const struct v4l2_rect *b;

+3 -3

drivers/media/pci/bt8xx/bttv-vbi.c

reviewed

··· 241 241 return 0; 242 242 } 243 243 244 244 - int bttv_try_fmt_vbi_cap(struct file *file, void *f, struct v4l2_format *frt) 244 244 + int bttv_try_fmt_vbi_cap(struct file *file, void *priv, struct v4l2_format *frt) 245 245 { 246 246 struct bttv *btv = video_drvdata(file); 247 247 const struct bttv_tvnorm *tvnorm; ··· 258 258 } 259 259 260 260 261 261 - int bttv_s_fmt_vbi_cap(struct file *file, void *f, struct v4l2_format *frt) 261 261 + int bttv_s_fmt_vbi_cap(struct file *file, void *priv, struct v4l2_format *frt) 262 262 { 263 263 struct bttv *btv = video_drvdata(file); 264 264 const struct bttv_tvnorm *tvnorm; ··· 301 301 } 302 302 303 303 304 304 - int bttv_g_fmt_vbi_cap(struct file *file, void *f, struct v4l2_format *frt) 304 304 + int bttv_g_fmt_vbi_cap(struct file *file, void *priv, struct v4l2_format *frt) 305 305 { 306 306 const struct bttv_tvnorm *tvnorm; 307 307 struct bttv *btv = video_drvdata(file);

+30 -30

drivers/media/pci/cobalt/cobalt-v4l2.c

reviewed

··· 447 447 return 0; 448 448 } 449 449 450 450 - static int cobalt_g_register(struct file *file, void *priv_fh, 450 450 + static int cobalt_g_register(struct file *file, void *priv, 451 451 struct v4l2_dbg_register *reg) 452 452 { 453 453 struct cobalt_stream *s = video_drvdata(file); ··· 456 456 return cobalt_cobaltc(cobalt, VIDIOC_DBG_G_REGISTER, reg); 457 457 } 458 458 459 459 - static int cobalt_s_register(struct file *file, void *priv_fh, 459 459 + static int cobalt_s_register(struct file *file, void *priv, 460 460 const struct v4l2_dbg_register *reg) 461 461 { 462 462 struct cobalt_stream *s = video_drvdata(file); ··· 467 467 } 468 468 #endif 469 469 470 470 - static int cobalt_querycap(struct file *file, void *priv_fh, 470 470 + static int cobalt_querycap(struct file *file, void *priv, 471 471 struct v4l2_capability *vcap) 472 472 { 473 473 struct cobalt_stream *s = video_drvdata(file); ··· 562 562 cobalt_info("rx%d: Packer: %x\n", rx, ioread32(&packer->control)); 563 563 } 564 564 565 565 - static int cobalt_log_status(struct file *file, void *priv_fh) 565 565 + static int cobalt_log_status(struct file *file, void *priv) 566 566 { 567 567 struct cobalt_stream *s = video_drvdata(file); 568 568 struct cobalt *cobalt = s->cobalt; ··· 596 596 return 0; 597 597 } 598 598 599 599 - static int cobalt_enum_dv_timings(struct file *file, void *priv_fh, 599 599 + static int cobalt_enum_dv_timings(struct file *file, void *priv, 600 600 struct v4l2_enum_dv_timings *timings) 601 601 { 602 602 struct cobalt_stream *s = video_drvdata(file); ··· 613 613 pad, enum_dv_timings, timings); 614 614 } 615 615 616 616 - static int cobalt_s_dv_timings(struct file *file, void *priv_fh, 616 616 + static int cobalt_s_dv_timings(struct file *file, void *priv, 617 617 struct v4l2_dv_timings *timings) 618 618 { 619 619 struct cobalt_stream *s = video_drvdata(file); ··· 641 641 return err; 642 642 } 643 643 644 644 - static int cobalt_g_dv_timings(struct file *file, void *priv_fh, 644 644 + static int cobalt_g_dv_timings(struct file *file, void *priv, 645 645 struct v4l2_dv_timings *timings) 646 646 { 647 647 struct cobalt_stream *s = video_drvdata(file); ··· 654 654 pad, g_dv_timings, 0, timings); 655 655 } 656 656 657 657 - static int cobalt_query_dv_timings(struct file *file, void *priv_fh, 657 657 + static int cobalt_query_dv_timings(struct file *file, void *priv, 658 658 struct v4l2_dv_timings *timings) 659 659 { 660 660 struct cobalt_stream *s = video_drvdata(file); ··· 667 667 pad, query_dv_timings, 0, timings); 668 668 } 669 669 670 670 - static int cobalt_dv_timings_cap(struct file *file, void *priv_fh, 670 670 + static int cobalt_dv_timings_cap(struct file *file, void *priv, 671 671 struct v4l2_dv_timings_cap *cap) 672 672 { 673 673 struct cobalt_stream *s = video_drvdata(file); ··· 677 677 pad, dv_timings_cap, cap); 678 678 } 679 679 680 680 - static int cobalt_enum_fmt_vid_cap(struct file *file, void *priv_fh, 680 680 + static int cobalt_enum_fmt_vid_cap(struct file *file, void *priv, 681 681 struct v4l2_fmtdesc *f) 682 682 { 683 683 switch (f->index) { ··· 697 697 return 0; 698 698 } 699 699 700 700 - static int cobalt_g_fmt_vid_cap(struct file *file, void *priv_fh, 700 700 + static int cobalt_g_fmt_vid_cap(struct file *file, void *priv, 701 701 struct v4l2_format *f) 702 702 { 703 703 struct cobalt_stream *s = video_drvdata(file); ··· 726 726 return 0; 727 727 } 728 728 729 729 - static int cobalt_try_fmt_vid_cap(struct file *file, void *priv_fh, 729 729 + static int cobalt_try_fmt_vid_cap(struct file *file, void *priv, 730 730 struct v4l2_format *f) 731 731 { 732 732 struct cobalt_stream *s = video_drvdata(file); ··· 787 787 return 0; 788 788 } 789 789 790 790 - static int cobalt_s_fmt_vid_cap(struct file *file, void *priv_fh, 790 790 + static int cobalt_s_fmt_vid_cap(struct file *file, void *priv, 791 791 struct v4l2_format *f) 792 792 { 793 793 struct cobalt_stream *s = video_drvdata(file); ··· 796 796 if (vb2_is_busy(&s->q)) 797 797 return -EBUSY; 798 798 799 799 - if (cobalt_try_fmt_vid_cap(file, priv_fh, f)) 799 799 + if (cobalt_try_fmt_vid_cap(file, priv, f)) 800 800 return -EINVAL; 801 801 802 802 s->width = pix->width; ··· 821 821 return 0; 822 822 } 823 823 824 824 - static int cobalt_try_fmt_vid_out(struct file *file, void *priv_fh, 824 824 + static int cobalt_try_fmt_vid_out(struct file *file, void *priv, 825 825 struct v4l2_format *f) 826 826 { 827 827 struct v4l2_pix_format *pix = &f->fmt.pix; ··· 862 862 return 0; 863 863 } 864 864 865 865 - static int cobalt_g_fmt_vid_out(struct file *file, void *priv_fh, 865 865 + static int cobalt_g_fmt_vid_out(struct file *file, void *priv, 866 866 struct v4l2_format *f) 867 867 { 868 868 struct cobalt_stream *s = video_drvdata(file); ··· 882 882 return 0; 883 883 } 884 884 885 885 - static int cobalt_enum_fmt_vid_out(struct file *file, void *priv_fh, 885 885 + static int cobalt_enum_fmt_vid_out(struct file *file, void *priv, 886 886 struct v4l2_fmtdesc *f) 887 887 { 888 888 switch (f->index) { ··· 899 899 return 0; 900 900 } 901 901 902 902 - static int cobalt_s_fmt_vid_out(struct file *file, void *priv_fh, 902 902 + static int cobalt_s_fmt_vid_out(struct file *file, void *priv, 903 903 struct v4l2_format *f) 904 904 { 905 905 struct cobalt_stream *s = video_drvdata(file); ··· 909 909 }; 910 910 u32 code; 911 911 912 912 - if (cobalt_try_fmt_vid_out(file, priv_fh, f)) 912 912 + if (cobalt_try_fmt_vid_out(file, priv, f)) 913 913 return -EINVAL; 914 914 915 915 if (vb2_is_busy(&s->q) && (pix->pixelformat != s->pixfmt || ··· 942 942 return 0; 943 943 } 944 944 945 945 - static int cobalt_enum_input(struct file *file, void *priv_fh, 945 945 + static int cobalt_enum_input(struct file *file, void *priv, 946 946 struct v4l2_input *inp) 947 947 { 948 948 struct cobalt_stream *s = video_drvdata(file); ··· 963 963 video, g_input_status, &inp->status); 964 964 } 965 965 966 966 - static int cobalt_g_input(struct file *file, void *priv_fh, unsigned int *i) 966 966 + static int cobalt_g_input(struct file *file, void *priv, unsigned int *i) 967 967 { 968 968 struct cobalt_stream *s = video_drvdata(file); 969 969 ··· 971 971 return 0; 972 972 } 973 973 974 974 - static int cobalt_s_input(struct file *file, void *priv_fh, unsigned int i) 974 974 + static int cobalt_s_input(struct file *file, void *priv, unsigned int i) 975 975 { 976 976 struct cobalt_stream *s = video_drvdata(file); 977 977 ··· 990 990 ADV76XX_PAD_HDMI_PORT_A, 0, 0); 991 991 } 992 992 993 993 - static int cobalt_enum_output(struct file *file, void *priv_fh, 993 993 + static int cobalt_enum_output(struct file *file, void *priv, 994 994 struct v4l2_output *out) 995 995 { 996 996 if (out->index) ··· 1001 1001 return 0; 1002 1002 } 1003 1003 1004 1004 - static int cobalt_g_output(struct file *file, void *priv_fh, unsigned int *i) 1004 1004 + static int cobalt_g_output(struct file *file, void *priv, unsigned int *i) 1005 1005 { 1006 1006 *i = 0; 1007 1007 return 0; 1008 1008 } 1009 1009 1010 1010 - static int cobalt_s_output(struct file *file, void *priv_fh, unsigned int i) 1010 1010 + static int cobalt_s_output(struct file *file, void *priv, unsigned int i) 1011 1011 { 1012 1012 return i ? -EINVAL : 0; 1013 1013 } 1014 1014 1015 1015 - static int cobalt_g_edid(struct file *file, void *fh, struct v4l2_edid *edid) 1015 1015 + static int cobalt_g_edid(struct file *file, void *priv, struct v4l2_edid *edid) 1016 1016 { 1017 1017 struct cobalt_stream *s = video_drvdata(file); 1018 1018 u32 pad = edid->pad; ··· 1026 1026 return ret; 1027 1027 } 1028 1028 1029 1029 - static int cobalt_s_edid(struct file *file, void *fh, struct v4l2_edid *edid) 1029 1029 + static int cobalt_s_edid(struct file *file, void *priv, struct v4l2_edid *edid) 1030 1030 { 1031 1031 struct cobalt_stream *s = video_drvdata(file); 1032 1032 u32 pad = edid->pad; ··· 1050 1050 return v4l2_ctrl_subscribe_event(fh, sub); 1051 1051 } 1052 1052 1053 1053 - static int cobalt_g_parm(struct file *file, void *fh, struct v4l2_streamparm *a) 1053 1053 + static int cobalt_g_parm(struct file *file, void *priv, struct v4l2_streamparm *a) 1054 1054 { 1055 1055 struct cobalt_stream *s = video_drvdata(file); 1056 1056 struct v4l2_fract fps; ··· 1065 1065 return 0; 1066 1066 } 1067 1067 1068 1068 - static int cobalt_g_pixelaspect(struct file *file, void *fh, 1068 1068 + static int cobalt_g_pixelaspect(struct file *file, void *priv, 1069 1069 int type, struct v4l2_fract *f) 1070 1070 { 1071 1071 struct cobalt_stream *s = video_drvdata(file); ··· 1084 1084 return err; 1085 1085 } 1086 1086 1087 1087 - static int cobalt_g_selection(struct file *file, void *fh, 1087 1087 + static int cobalt_g_selection(struct file *file, void *priv, 1088 1088 struct v4l2_selection *sel) 1089 1089 { 1090 1090 struct cobalt_stream *s = video_drvdata(file);

+2 -2

drivers/media/pci/saa7134/saa7134-video.c

reviewed

··· 1302 1302 return 0; 1303 1303 } 1304 1304 1305 1305 - static int saa7134_g_selection(struct file *file, void *f, struct v4l2_selection *sel) 1305 1305 + static int saa7134_g_selection(struct file *file, void *priv, struct v4l2_selection *sel) 1306 1306 { 1307 1307 struct saa7134_dev *dev = video_drvdata(file); 1308 1308 ··· 1325 1325 return 0; 1326 1326 } 1327 1327 1328 1328 - static int saa7134_s_selection(struct file *file, void *f, struct v4l2_selection *sel) 1328 1328 + static int saa7134_s_selection(struct file *file, void *priv, struct v4l2_selection *sel) 1329 1329 { 1330 1330 struct saa7134_dev *dev = video_drvdata(file); 1331 1331 struct v4l2_rect *b = &dev->crop_bounds;

+7 -7

drivers/media/platform/rockchip/rga/rga.c

reviewed

··· 446 446 return 0; 447 447 } 448 448 449 449 - static int vidioc_enum_fmt(struct file *file, void *prv, struct v4l2_fmtdesc *f) 449 449 + static int vidioc_enum_fmt(struct file *file, void *priv, struct v4l2_fmtdesc *f) 450 450 { 451 451 struct rga_fmt *fmt; 452 452 ··· 459 459 return 0; 460 460 } 461 461 462 462 - static int vidioc_g_fmt(struct file *file, void *prv, struct v4l2_format *f) 462 462 + static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f) 463 463 { 464 464 struct v4l2_pix_format_mplane *pix_fmt = &f->fmt.pix_mp; 465 465 struct rga_ctx *ctx = file_to_rga_ctx(file); ··· 481 481 return 0; 482 482 } 483 483 484 484 - static int vidioc_try_fmt(struct file *file, void *prv, struct v4l2_format *f) 484 484 + static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f) 485 485 { 486 486 struct v4l2_pix_format_mplane *pix_fmt = &f->fmt.pix_mp; 487 487 struct rga_fmt *fmt; ··· 501 501 return 0; 502 502 } 503 503 504 504 - static int vidioc_s_fmt(struct file *file, void *prv, struct v4l2_format *f) 504 504 + static int vidioc_s_fmt(struct file *file, void *priv, struct v4l2_format *f) 505 505 { 506 506 struct v4l2_pix_format_mplane *pix_fmt = &f->fmt.pix_mp; 507 507 struct rga_ctx *ctx = file_to_rga_ctx(file); ··· 514 514 /* Adjust all values accordingly to the hardware capabilities 515 515 * and chosen format. 516 516 */ 517 517 - ret = vidioc_try_fmt(file, prv, f); 517 517 + ret = vidioc_try_fmt(file, priv, f); 518 518 if (ret) 519 519 return ret; 520 520 vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type); ··· 558 558 return 0; 559 559 } 560 560 561 561 - static int vidioc_g_selection(struct file *file, void *prv, 561 561 + static int vidioc_g_selection(struct file *file, void *priv, 562 562 struct v4l2_selection *s) 563 563 { 564 564 struct rga_ctx *ctx = file_to_rga_ctx(file); ··· 606 606 return 0; 607 607 } 608 608 609 609 - static int vidioc_s_selection(struct file *file, void *prv, 609 609 + static int vidioc_s_selection(struct file *file, void *priv, 610 610 struct v4l2_selection *s) 611 611 { 612 612 struct rga_ctx *ctx = file_to_rga_ctx(file);

+9 -9

drivers/media/platform/samsung/s5p-g2d/g2d.c

reviewed

··· 297 297 return 0; 298 298 } 299 299 300 300 - static int vidioc_enum_fmt(struct file *file, void *prv, struct v4l2_fmtdesc *f) 300 300 + static int vidioc_enum_fmt(struct file *file, void *priv, struct v4l2_fmtdesc *f) 301 301 { 302 302 if (f->index >= NUM_FORMATS) 303 303 return -EINVAL; ··· 305 305 return 0; 306 306 } 307 307 308 308 - static int vidioc_g_fmt(struct file *file, void *prv, struct v4l2_format *f) 308 308 + static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f) 309 309 { 310 310 struct g2d_ctx *ctx = file2ctx(file); 311 311 struct vb2_queue *vq; ··· 327 327 return 0; 328 328 } 329 329 330 330 - static int vidioc_try_fmt(struct file *file, void *prv, struct v4l2_format *f) 330 330 + static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f) 331 331 { 332 332 struct g2d_fmt *fmt; 333 333 enum v4l2_field *field; ··· 357 357 return 0; 358 358 } 359 359 360 360 - static int vidioc_s_fmt(struct file *file, void *prv, struct v4l2_format *f) 360 360 + static int vidioc_s_fmt(struct file *file, void *priv, struct v4l2_format *f) 361 361 { 362 362 struct g2d_ctx *ctx = file2ctx(file); 363 363 struct g2d_dev *dev = ctx->dev; ··· 368 368 369 369 /* Adjust all values accordingly to the hardware capabilities 370 370 * and chosen format. */ 371 371 - ret = vidioc_try_fmt(file, prv, f); 371 371 + ret = vidioc_try_fmt(file, priv, f); 372 372 if (ret) 373 373 return ret; 374 374 vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type); ··· 397 397 return 0; 398 398 } 399 399 400 400 - static int vidioc_g_selection(struct file *file, void *prv, 400 400 + static int vidioc_g_selection(struct file *file, void *priv, 401 401 struct v4l2_selection *s) 402 402 { 403 403 struct g2d_ctx *ctx = file2ctx(file); ··· 447 447 return 0; 448 448 } 449 449 450 450 - static int vidioc_try_selection(struct file *file, void *prv, 450 450 + static int vidioc_try_selection(struct file *file, void *priv, 451 451 const struct v4l2_selection *s) 452 452 { 453 453 struct g2d_ctx *ctx = file2ctx(file); ··· 475 475 return 0; 476 476 } 477 477 478 478 - static int vidioc_s_selection(struct file *file, void *prv, 478 478 + static int vidioc_s_selection(struct file *file, void *priv, 479 479 struct v4l2_selection *s) 480 480 { 481 481 struct g2d_ctx *ctx = file2ctx(file); 482 482 struct g2d_frame *f; 483 483 int ret; 484 484 485 485 - ret = vidioc_try_selection(file, prv, s); 485 485 + ret = vidioc_try_selection(file, priv, s); 486 486 if (ret) 487 487 return ret; 488 488 f = get_frame(ctx, s->type);

+1 -1

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c

reviewed

··· 330 330 return 0; 331 331 } 332 332 333 333 - static int vidioc_enum_fmt_vid_cap(struct file *file, void *pirv, 333 333 + static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv, 334 334 struct v4l2_fmtdesc *f) 335 335 { 336 336 return vidioc_enum_fmt(file, f, false);

+1 -1

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c

reviewed

··· 1375 1375 return -EINVAL; 1376 1376 } 1377 1377 1378 1378 - static int vidioc_enum_fmt_vid_cap(struct file *file, void *pirv, 1378 1378 + static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv, 1379 1379 struct v4l2_fmtdesc *f) 1380 1380 { 1381 1381 return vidioc_enum_fmt(file, f, false);

+5 -5

drivers/media/platform/st/stm32/dma2d/dma2d.c

reviewed

··· 343 343 return 0; 344 344 } 345 345 346 346 - static int vidioc_enum_fmt(struct file *file, void *prv, struct v4l2_fmtdesc *f) 346 346 + static int vidioc_enum_fmt(struct file *file, void *priv, struct v4l2_fmtdesc *f) 347 347 { 348 348 if (f->index >= NUM_FORMATS) 349 349 return -EINVAL; ··· 352 352 return 0; 353 353 } 354 354 355 355 - static int vidioc_g_fmt(struct file *file, void *prv, struct v4l2_format *f) 355 355 + static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f) 356 356 { 357 357 struct dma2d_ctx *ctx = file2ctx(file); 358 358 struct vb2_queue *vq; ··· 377 377 return 0; 378 378 } 379 379 380 380 - static int vidioc_try_fmt(struct file *file, void *prv, struct v4l2_format *f) 380 380 + static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f) 381 381 { 382 382 struct dma2d_ctx *ctx = file2ctx(file); 383 383 struct dma2d_fmt *fmt; ··· 420 420 return 0; 421 421 } 422 422 423 423 - static int vidioc_s_fmt(struct file *file, void *prv, struct v4l2_format *f) 423 423 + static int vidioc_s_fmt(struct file *file, void *priv, struct v4l2_format *f) 424 424 { 425 425 struct dma2d_ctx *ctx = file2ctx(file); 426 426 struct vb2_queue *vq; ··· 431 431 /* Adjust all values accordingly to the hardware capabilities 432 432 * and chosen format. 433 433 */ 434 434 - ret = vidioc_try_fmt(file, prv, f); 434 434 + ret = vidioc_try_fmt(file, priv, f); 435 435 if (ret) 436 436 return ret; 437 437

+8 -8

drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c

reviewed

··· 711 711 pix_format->xfer_func = V4L2_XFER_FUNC_DEFAULT; 712 712 } 713 713 714 714 - static int sun6i_csi_capture_querycap(struct file *file, void *private, 714 714 + static int sun6i_csi_capture_querycap(struct file *file, void *priv, 715 715 struct v4l2_capability *capability) 716 716 { 717 717 struct sun6i_csi_device *csi_dev = video_drvdata(file); ··· 725 725 return 0; 726 726 } 727 727 728 728 - static int sun6i_csi_capture_enum_fmt(struct file *file, void *private, 728 728 + static int sun6i_csi_capture_enum_fmt(struct file *file, void *priv, 729 729 struct v4l2_fmtdesc *fmtdesc) 730 730 { 731 731 u32 index = fmtdesc->index; ··· 738 738 return 0; 739 739 } 740 740 741 741 - static int sun6i_csi_capture_g_fmt(struct file *file, void *private, 741 741 + static int sun6i_csi_capture_g_fmt(struct file *file, void *priv, 742 742 struct v4l2_format *format) 743 743 { 744 744 struct sun6i_csi_device *csi_dev = video_drvdata(file); ··· 748 748 return 0; 749 749 } 750 750 751 751 - static int sun6i_csi_capture_s_fmt(struct file *file, void *private, 751 751 + static int sun6i_csi_capture_s_fmt(struct file *file, void *priv, 752 752 struct v4l2_format *format) 753 753 { 754 754 struct sun6i_csi_device *csi_dev = video_drvdata(file); ··· 764 764 return 0; 765 765 } 766 766 767 767 - static int sun6i_csi_capture_try_fmt(struct file *file, void *private, 767 767 + static int sun6i_csi_capture_try_fmt(struct file *file, void *priv, 768 768 struct v4l2_format *format) 769 769 { 770 770 sun6i_csi_capture_format_prepare(format); ··· 772 772 return 0; 773 773 } 774 774 775 775 - static int sun6i_csi_capture_enum_input(struct file *file, void *private, 775 775 + static int sun6i_csi_capture_enum_input(struct file *file, void *priv, 776 776 struct v4l2_input *input) 777 777 { 778 778 if (input->index != 0) ··· 784 784 return 0; 785 785 } 786 786 787 787 - static int sun6i_csi_capture_g_input(struct file *file, void *private, 787 787 + static int sun6i_csi_capture_g_input(struct file *file, void *priv, 788 788 unsigned int *index) 789 789 { 790 790 *index = 0; ··· 792 792 return 0; 793 793 } 794 794 795 795 - static int sun6i_csi_capture_s_input(struct file *file, void *private, 795 795 + static int sun6i_csi_capture_s_input(struct file *file, void *priv, 796 796 unsigned int index) 797 797 { 798 798 if (index != 0)

+4 -4

drivers/media/platform/synopsys/hdmirx/snps_hdmirx.c

reviewed

··· 459 459 return !tx_5v_power_present(hdmirx_dev); 460 460 } 461 461 462 462 - static int hdmirx_query_dv_timings(struct file *file, void *_fh, 462 462 + static int hdmirx_query_dv_timings(struct file *file, void *priv, 463 463 struct v4l2_dv_timings *timings) 464 464 { 465 465 struct hdmirx_stream *stream = video_drvdata(file); ··· 751 751 return 0; 752 752 } 753 753 754 754 - static int hdmirx_enum_dv_timings(struct file *file, void *_fh, 754 754 + static int hdmirx_enum_dv_timings(struct file *file, void *priv, 755 755 struct v4l2_enum_dv_timings *timings) 756 756 { 757 757 return v4l2_enum_dv_timings_cap(timings, &hdmirx_timings_cap, NULL, NULL); ··· 1323 1323 return 0; 1324 1324 } 1325 1325 1326 1326 - static int hdmirx_g_dv_timings(struct file *file, void *_fh, 1326 1326 + static int hdmirx_g_dv_timings(struct file *file, void *priv, 1327 1327 struct v4l2_dv_timings *timings) 1328 1328 { 1329 1329 struct hdmirx_stream *stream = video_drvdata(file); ··· 1339 1339 return 0; 1340 1340 } 1341 1341 1342 1342 - static int hdmirx_s_dv_timings(struct file *file, void *_fh, 1342 1342 + static int hdmirx_s_dv_timings(struct file *file, void *priv, 1343 1343 struct v4l2_dv_timings *timings) 1344 1344 { 1345 1345 struct hdmirx_stream *stream = video_drvdata(file);

+1 -1

drivers/media/platform/ti/j721e-csi2rx/j721e-csi2rx.c

reviewed

··· 299 299 return 0; 300 300 } 301 301 302 302 - static int ti_csi2rx_g_fmt_vid_cap(struct file *file, void *prov, 302 302 + static int ti_csi2rx_g_fmt_vid_cap(struct file *file, void *priv, 303 303 struct v4l2_format *f) 304 304 { 305 305 struct ti_csi2rx_dev *csi = video_drvdata(file);

+3 -3

drivers/media/platform/ti/omap/omap_vout.c

reviewed

··· 1236 1236 return 0; 1237 1237 } 1238 1238 1239 1239 - static int vidioc_enum_output(struct file *file, void *priv_fh, 1239 1239 + static int vidioc_enum_output(struct file *file, void *priv, 1240 1240 struct v4l2_output *out) 1241 1241 { 1242 1242 if (out->index) ··· 1246 1246 return 0; 1247 1247 } 1248 1248 1249 1249 - static int vidioc_g_output(struct file *file, void *priv_fh, unsigned int *i) 1249 1249 + static int vidioc_g_output(struct file *file, void *priv, unsigned int *i) 1250 1250 { 1251 1251 *i = 0; 1252 1252 return 0; 1253 1253 } 1254 1254 1255 1255 - static int vidioc_s_output(struct file *file, void *priv_fh, unsigned int i) 1255 1255 + static int vidioc_s_output(struct file *file, void *priv, unsigned int i) 1256 1256 { 1257 1257 return i ? -EINVAL : 0; 1258 1258 }

+5 -5

drivers/media/radio/si4713/radio-platform-si4713.c

reviewed

··· 75 75 return &((struct radio_si4713_device *)video_drvdata(file))->v4l2_dev; 76 76 } 77 77 78 78 - static int radio_si4713_g_modulator(struct file *file, void *p, 78 78 + static int radio_si4713_g_modulator(struct file *file, void *priv, 79 79 struct v4l2_modulator *vm) 80 80 { 81 81 return v4l2_device_call_until_err(get_v4l2_dev(file), 0, tuner, 82 82 g_modulator, vm); 83 83 } 84 84 85 85 - static int radio_si4713_s_modulator(struct file *file, void *p, 85 85 + static int radio_si4713_s_modulator(struct file *file, void *priv, 86 86 const struct v4l2_modulator *vm) 87 87 { 88 88 return v4l2_device_call_until_err(get_v4l2_dev(file), 0, tuner, 89 89 s_modulator, vm); 90 90 } 91 91 92 92 - static int radio_si4713_g_frequency(struct file *file, void *p, 92 92 + static int radio_si4713_g_frequency(struct file *file, void *priv, 93 93 struct v4l2_frequency *vf) 94 94 { 95 95 return v4l2_device_call_until_err(get_v4l2_dev(file), 0, tuner, 96 96 g_frequency, vf); 97 97 } 98 98 99 99 - static int radio_si4713_s_frequency(struct file *file, void *p, 99 99 + static int radio_si4713_s_frequency(struct file *file, void *priv, 100 100 const struct v4l2_frequency *vf) 101 101 { 102 102 return v4l2_device_call_until_err(get_v4l2_dev(file), 0, tuner, 103 103 s_frequency, vf); 104 104 } 105 105 106 106 - static long radio_si4713_default(struct file *file, void *p, 106 106 + static long radio_si4713_default(struct file *file, void *priv, 107 107 bool valid_prio, unsigned int cmd, void *arg) 108 108 { 109 109 return v4l2_device_call_until_err(get_v4l2_dev(file), 0, core,

+1 -1

drivers/media/usb/cx231xx/cx231xx-417.c

reviewed

··· 1499 1499 return 0; 1500 1500 } 1501 1501 1502 1502 - static int vidioc_g_std(struct file *file, void *fh0, v4l2_std_id *norm) 1502 1502 + static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *norm) 1503 1503 { 1504 1504 struct cx231xx *dev = video_drvdata(file); 1505 1505

+9 -9

drivers/media/usb/gspca/gspca.c

reviewed

··· 1029 1029 return 0; 1030 1030 } 1031 1031 1032 1032 - static int vidioc_g_fmt_vid_cap(struct file *file, void *_priv, 1032 1032 + static int vidioc_g_fmt_vid_cap(struct file *file, void *priv, 1033 1033 struct v4l2_format *fmt) 1034 1034 { 1035 1035 struct gspca_dev *gspca_dev = video_drvdata(file); 1036 1036 - u32 priv = fmt->fmt.pix.priv; 1036 1036 + u32 fmt_priv = fmt->fmt.pix.priv; 1037 1037 1038 1038 fmt->fmt.pix = gspca_dev->pixfmt; 1039 1039 /* some drivers use priv internally, so keep the original value */ 1040 1040 - fmt->fmt.pix.priv = priv; 1040 1040 + fmt->fmt.pix.priv = fmt_priv; 1041 1041 return 0; 1042 1042 } 1043 1043 ··· 1075 1075 return mode; /* used when s_fmt */ 1076 1076 } 1077 1077 1078 1078 - static int vidioc_try_fmt_vid_cap(struct file *file, void *_priv, 1078 1078 + static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, 1079 1079 struct v4l2_format *fmt) 1080 1080 { 1081 1081 struct gspca_dev *gspca_dev = video_drvdata(file); 1082 1082 - u32 priv = fmt->fmt.pix.priv; 1082 1082 + u32 fmt_priv = fmt->fmt.pix.priv; 1083 1083 1084 1084 if (try_fmt_vid_cap(gspca_dev, fmt) < 0) 1085 1085 return -EINVAL; 1086 1086 /* some drivers use priv internally, so keep the original value */ 1087 1087 - fmt->fmt.pix.priv = priv; 1087 1087 + fmt->fmt.pix.priv = fmt_priv; 1088 1088 return 0; 1089 1089 } 1090 1090 1091 1091 - static int vidioc_s_fmt_vid_cap(struct file *file, void *_priv, 1091 1091 + static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, 1092 1092 struct v4l2_format *fmt) 1093 1093 { 1094 1094 struct gspca_dev *gspca_dev = video_drvdata(file); 1095 1095 - u32 priv = fmt->fmt.pix.priv; 1095 1095 + u32 fmt_priv = fmt->fmt.pix.priv; 1096 1096 int mode; 1097 1097 1098 1098 if (vb2_is_busy(&gspca_dev->queue)) ··· 1109 1109 else 1110 1110 gspca_dev->pixfmt = gspca_dev->cam.cam_mode[mode]; 1111 1111 /* some drivers use priv internally, so keep the original value */ 1112 1112 - fmt->fmt.pix.priv = priv; 1112 1112 + fmt->fmt.pix.priv = fmt_priv; 1113 1113 return 0; 1114 1114 } 1115 1115

+15 -15

drivers/media/usb/hdpvr/hdpvr-video.c

reviewed

··· 590 590 return 0; 591 591 } 592 592 593 593 - static int vidioc_s_std(struct file *file, void *_fh, 593 593 + static int vidioc_s_std(struct file *file, void *priv, 594 594 v4l2_std_id std) 595 595 { 596 596 struct hdpvr_device *dev = video_drvdata(file); ··· 610 610 return hdpvr_config_call(dev, CTRL_VIDEO_STD_TYPE, std_type); 611 611 } 612 612 613 613 - static int vidioc_g_std(struct file *file, void *_fh, 613 613 + static int vidioc_g_std(struct file *file, void *priv, 614 614 v4l2_std_id *std) 615 615 { 616 616 struct hdpvr_device *dev = video_drvdata(file); ··· 623 623 return 0; 624 624 } 625 625 626 626 - static int vidioc_querystd(struct file *file, void *_fh, v4l2_std_id *a) 626 626 + static int vidioc_querystd(struct file *file, void *priv, v4l2_std_id *a) 627 627 { 628 628 struct hdpvr_device *dev = video_drvdata(file); 629 629 struct hdpvr_fh *fh = file_to_hdpvr_fh(file); ··· 642 642 return ret; 643 643 } 644 644 645 645 - static int vidioc_s_dv_timings(struct file *file, void *_fh, 645 645 + static int vidioc_s_dv_timings(struct file *file, void *priv, 646 646 struct v4l2_dv_timings *timings) 647 647 { 648 648 struct hdpvr_device *dev = video_drvdata(file); ··· 665 665 return 0; 666 666 } 667 667 668 668 - static int vidioc_g_dv_timings(struct file *file, void *_fh, 668 668 + static int vidioc_g_dv_timings(struct file *file, void *priv, 669 669 struct v4l2_dv_timings *timings) 670 670 { 671 671 struct hdpvr_device *dev = video_drvdata(file); ··· 678 678 return 0; 679 679 } 680 680 681 681 - static int vidioc_query_dv_timings(struct file *file, void *_fh, 681 681 + static int vidioc_query_dv_timings(struct file *file, void *priv, 682 682 struct v4l2_dv_timings *timings) 683 683 { 684 684 struct hdpvr_device *dev = video_drvdata(file); ··· 720 720 return ret; 721 721 } 722 722 723 723 - static int vidioc_enum_dv_timings(struct file *file, void *_fh, 723 723 + static int vidioc_enum_dv_timings(struct file *file, void *priv, 724 724 struct v4l2_enum_dv_timings *timings) 725 725 { 726 726 struct hdpvr_device *dev = video_drvdata(file); ··· 736 736 return 0; 737 737 } 738 738 739 739 - static int vidioc_dv_timings_cap(struct file *file, void *_fh, 739 739 + static int vidioc_dv_timings_cap(struct file *file, void *priv, 740 740 struct v4l2_dv_timings_cap *cap) 741 741 { 742 742 struct hdpvr_device *dev = video_drvdata(file); ··· 763 763 [HDPVR_COMPOSITE] = "Composite", 764 764 }; 765 765 766 766 - static int vidioc_enum_input(struct file *file, void *_fh, struct v4l2_input *i) 766 766 + static int vidioc_enum_input(struct file *file, void *priv, struct v4l2_input *i) 767 767 { 768 768 unsigned int n; 769 769 ··· 783 783 return 0; 784 784 } 785 785 786 786 - static int vidioc_s_input(struct file *file, void *_fh, 786 786 + static int vidioc_s_input(struct file *file, void *priv, 787 787 unsigned int index) 788 788 { 789 789 struct hdpvr_device *dev = video_drvdata(file); ··· 817 817 return retval; 818 818 } 819 819 820 820 - static int vidioc_g_input(struct file *file, void *private_data, 820 820 + static int vidioc_g_input(struct file *file, void *priv, 821 821 unsigned int *index) 822 822 { 823 823 struct hdpvr_device *dev = video_drvdata(file); ··· 849 849 return 0; 850 850 } 851 851 852 852 - static int vidioc_s_audio(struct file *file, void *private_data, 852 852 + static int vidioc_s_audio(struct file *file, void *priv, 853 853 const struct v4l2_audio *audio) 854 854 { 855 855 struct hdpvr_device *dev = video_drvdata(file); ··· 868 868 return retval; 869 869 } 870 870 871 871 - static int vidioc_g_audio(struct file *file, void *private_data, 871 871 + static int vidioc_g_audio(struct file *file, void *priv, 872 872 struct v4l2_audio *audio) 873 873 { 874 874 struct hdpvr_device *dev = video_drvdata(file); ··· 985 985 return ret; 986 986 } 987 987 988 988 - static int vidioc_enum_fmt_vid_cap(struct file *file, void *private_data, 988 988 + static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv, 989 989 struct v4l2_fmtdesc *f) 990 990 { 991 991 if (f->index != 0) ··· 996 996 return 0; 997 997 } 998 998 999 999 - static int vidioc_g_fmt_vid_cap(struct file *file, void *_fh, 999 999 + static int vidioc_g_fmt_vid_cap(struct file *file, void *priv, 1000 1000 struct v4l2_format *f) 1001 1001 { 1002 1002 struct hdpvr_device *dev = video_drvdata(file);