tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

V4L/DVB: v4l: Use v4l2_get_subdevdata instead of accessing v4l2_subdev::priv

Replace direct access to the v4l2_subdev priv field with the inline
v4l2_get_subdevdata method.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Laurent Pinchart and committed by
Mauro Carvalho Chehab c4ce6d14 401ad278

+94 -94
+13 -13
drivers/media/video/mt9m001.c
··· 157 157 158 158 static int mt9m001_s_stream(struct v4l2_subdev *sd, int enable) 159 159 { 160 - struct i2c_client *client = sd->priv; 160 + struct i2c_client *client = v4l2_get_subdevdata(sd); 161 161 162 162 /* Switch to master "normal" mode or stop sensor readout */ 163 163 if (reg_write(client, MT9M001_OUTPUT_CONTROL, enable ? 2 : 0) < 0) ··· 206 206 207 207 static int mt9m001_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 208 208 { 209 - struct i2c_client *client = sd->priv; 209 + struct i2c_client *client = v4l2_get_subdevdata(sd); 210 210 struct mt9m001 *mt9m001 = to_mt9m001(client); 211 211 struct v4l2_rect rect = a->c; 212 212 struct soc_camera_device *icd = client->dev.platform_data; ··· 271 271 272 272 static int mt9m001_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 273 273 { 274 - struct i2c_client *client = sd->priv; 274 + struct i2c_client *client = v4l2_get_subdevdata(sd); 275 275 struct mt9m001 *mt9m001 = to_mt9m001(client); 276 276 277 277 a->c = mt9m001->rect; ··· 297 297 static int mt9m001_g_fmt(struct v4l2_subdev *sd, 298 298 struct v4l2_mbus_framefmt *mf) 299 299 { 300 - struct i2c_client *client = sd->priv; 300 + struct i2c_client *client = v4l2_get_subdevdata(sd); 301 301 struct mt9m001 *mt9m001 = to_mt9m001(client); 302 302 303 303 mf->width = mt9m001->rect.width; ··· 312 312 static int mt9m001_s_fmt(struct v4l2_subdev *sd, 313 313 struct v4l2_mbus_framefmt *mf) 314 314 { 315 - struct i2c_client *client = sd->priv; 315 + struct i2c_client *client = v4l2_get_subdevdata(sd); 316 316 struct mt9m001 *mt9m001 = to_mt9m001(client); 317 317 struct v4l2_crop a = { 318 318 .c = { ··· 340 340 static int mt9m001_try_fmt(struct v4l2_subdev *sd, 341 341 struct v4l2_mbus_framefmt *mf) 342 342 { 343 - struct i2c_client *client = sd->priv; 343 + struct i2c_client *client = v4l2_get_subdevdata(sd); 344 344 struct mt9m001 *mt9m001 = to_mt9m001(client); 345 345 const struct mt9m001_datafmt *fmt; 346 346 ··· 367 367 static int mt9m001_g_chip_ident(struct v4l2_subdev *sd, 368 368 struct v4l2_dbg_chip_ident *id) 369 369 { 370 - struct i2c_client *client = sd->priv; 370 + struct i2c_client *client = v4l2_get_subdevdata(sd); 371 371 struct mt9m001 *mt9m001 = to_mt9m001(client); 372 372 373 373 if (id->match.type != V4L2_CHIP_MATCH_I2C_ADDR) ··· 386 386 static int mt9m001_g_register(struct v4l2_subdev *sd, 387 387 struct v4l2_dbg_register *reg) 388 388 { 389 - struct i2c_client *client = sd->priv; 389 + struct i2c_client *client = v4l2_get_subdevdata(sd); 390 390 391 391 if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff) 392 392 return -EINVAL; ··· 406 406 static int mt9m001_s_register(struct v4l2_subdev *sd, 407 407 struct v4l2_dbg_register *reg) 408 408 { 409 - struct i2c_client *client = sd->priv; 409 + struct i2c_client *client = v4l2_get_subdevdata(sd); 410 410 411 411 if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff) 412 412 return -EINVAL; ··· 468 468 469 469 static int mt9m001_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) 470 470 { 471 - struct i2c_client *client = sd->priv; 471 + struct i2c_client *client = v4l2_get_subdevdata(sd); 472 472 struct mt9m001 *mt9m001 = to_mt9m001(client); 473 473 int data; 474 474 ··· 494 494 495 495 static int mt9m001_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) 496 496 { 497 - struct i2c_client *client = sd->priv; 497 + struct i2c_client *client = v4l2_get_subdevdata(sd); 498 498 struct mt9m001 *mt9m001 = to_mt9m001(client); 499 499 struct soc_camera_device *icd = client->dev.platform_data; 500 500 const struct v4l2_queryctrl *qctrl; ··· 683 683 684 684 static int mt9m001_g_skip_top_lines(struct v4l2_subdev *sd, u32 *lines) 685 685 { 686 - struct i2c_client *client = sd->priv; 686 + struct i2c_client *client = v4l2_get_subdevdata(sd); 687 687 struct mt9m001 *mt9m001 = to_mt9m001(client); 688 688 689 689 *lines = mt9m001->y_skip_top; ··· 704 704 static int mt9m001_enum_fmt(struct v4l2_subdev *sd, unsigned int index, 705 705 enum v4l2_mbus_pixelcode *code) 706 706 { 707 - struct i2c_client *client = sd->priv; 707 + struct i2c_client *client = v4l2_get_subdevdata(sd); 708 708 struct mt9m001 *mt9m001 = to_mt9m001(client); 709 709 710 710 if (index >= mt9m001->num_fmts)
+10 -10
drivers/media/video/mt9m111.c
··· 440 440 static int mt9m111_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 441 441 { 442 442 struct v4l2_rect rect = a->c; 443 - struct i2c_client *client = sd->priv; 443 + struct i2c_client *client = v4l2_get_subdevdata(sd); 444 444 struct mt9m111 *mt9m111 = to_mt9m111(client); 445 445 int ret; 446 446 ··· 458 458 459 459 static int mt9m111_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 460 460 { 461 - struct i2c_client *client = sd->priv; 461 + struct i2c_client *client = v4l2_get_subdevdata(sd); 462 462 struct mt9m111 *mt9m111 = to_mt9m111(client); 463 463 464 464 a->c = mt9m111->rect; ··· 486 486 static int mt9m111_g_fmt(struct v4l2_subdev *sd, 487 487 struct v4l2_mbus_framefmt *mf) 488 488 { 489 - struct i2c_client *client = sd->priv; 489 + struct i2c_client *client = v4l2_get_subdevdata(sd); 490 490 struct mt9m111 *mt9m111 = to_mt9m111(client); 491 491 492 492 mf->width = mt9m111->rect.width; ··· 549 549 static int mt9m111_s_fmt(struct v4l2_subdev *sd, 550 550 struct v4l2_mbus_framefmt *mf) 551 551 { 552 - struct i2c_client *client = sd->priv; 552 + struct i2c_client *client = v4l2_get_subdevdata(sd); 553 553 const struct mt9m111_datafmt *fmt; 554 554 struct mt9m111 *mt9m111 = to_mt9m111(client); 555 555 struct v4l2_rect rect = { ··· 584 584 static int mt9m111_try_fmt(struct v4l2_subdev *sd, 585 585 struct v4l2_mbus_framefmt *mf) 586 586 { 587 - struct i2c_client *client = sd->priv; 587 + struct i2c_client *client = v4l2_get_subdevdata(sd); 588 588 struct mt9m111 *mt9m111 = to_mt9m111(client); 589 589 const struct mt9m111_datafmt *fmt; 590 590 bool bayer = mf->code == V4L2_MBUS_FMT_SBGGR8_1X8 || ··· 624 624 static int mt9m111_g_chip_ident(struct v4l2_subdev *sd, 625 625 struct v4l2_dbg_chip_ident *id) 626 626 { 627 - struct i2c_client *client = sd->priv; 627 + struct i2c_client *client = v4l2_get_subdevdata(sd); 628 628 struct mt9m111 *mt9m111 = to_mt9m111(client); 629 629 630 630 if (id->match.type != V4L2_CHIP_MATCH_I2C_ADDR) ··· 643 643 static int mt9m111_g_register(struct v4l2_subdev *sd, 644 644 struct v4l2_dbg_register *reg) 645 645 { 646 - struct i2c_client *client = sd->priv; 646 + struct i2c_client *client = v4l2_get_subdevdata(sd); 647 647 int val; 648 648 649 649 if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0x2ff) ··· 664 664 static int mt9m111_s_register(struct v4l2_subdev *sd, 665 665 struct v4l2_dbg_register *reg) 666 666 { 667 - struct i2c_client *client = sd->priv; 667 + struct i2c_client *client = v4l2_get_subdevdata(sd); 668 668 669 669 if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0x2ff) 670 670 return -EINVAL; ··· 812 812 813 813 static int mt9m111_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) 814 814 { 815 - struct i2c_client *client = sd->priv; 815 + struct i2c_client *client = v4l2_get_subdevdata(sd); 816 816 struct mt9m111 *mt9m111 = to_mt9m111(client); 817 817 int data; 818 818 ··· 855 855 856 856 static int mt9m111_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) 857 857 { 858 - struct i2c_client *client = sd->priv; 858 + struct i2c_client *client = v4l2_get_subdevdata(sd); 859 859 struct mt9m111 *mt9m111 = to_mt9m111(client); 860 860 const struct v4l2_queryctrl *qctrl; 861 861 int ret;
+12 -12
drivers/media/video/mt9t031.c
··· 163 163 164 164 static int mt9t031_s_stream(struct v4l2_subdev *sd, int enable) 165 165 { 166 - struct i2c_client *client = sd->priv; 166 + struct i2c_client *client = v4l2_get_subdevdata(sd); 167 167 int ret; 168 168 169 169 if (enable) ··· 393 393 static int mt9t031_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 394 394 { 395 395 struct v4l2_rect rect = a->c; 396 - struct i2c_client *client = sd->priv; 396 + struct i2c_client *client = v4l2_get_subdevdata(sd); 397 397 struct mt9t031 *mt9t031 = to_mt9t031(client); 398 398 399 399 rect.width = ALIGN(rect.width, 2); ··· 410 410 411 411 static int mt9t031_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 412 412 { 413 - struct i2c_client *client = sd->priv; 413 + struct i2c_client *client = v4l2_get_subdevdata(sd); 414 414 struct mt9t031 *mt9t031 = to_mt9t031(client); 415 415 416 416 a->c = mt9t031->rect; ··· 436 436 static int mt9t031_g_fmt(struct v4l2_subdev *sd, 437 437 struct v4l2_mbus_framefmt *mf) 438 438 { 439 - struct i2c_client *client = sd->priv; 439 + struct i2c_client *client = v4l2_get_subdevdata(sd); 440 440 struct mt9t031 *mt9t031 = to_mt9t031(client); 441 441 442 442 mf->width = mt9t031->rect.width / mt9t031->xskip; ··· 451 451 static int mt9t031_s_fmt(struct v4l2_subdev *sd, 452 452 struct v4l2_mbus_framefmt *mf) 453 453 { 454 - struct i2c_client *client = sd->priv; 454 + struct i2c_client *client = v4l2_get_subdevdata(sd); 455 455 struct mt9t031 *mt9t031 = to_mt9t031(client); 456 456 u16 xskip, yskip; 457 457 struct v4l2_rect rect = mt9t031->rect; ··· 490 490 static int mt9t031_g_chip_ident(struct v4l2_subdev *sd, 491 491 struct v4l2_dbg_chip_ident *id) 492 492 { 493 - struct i2c_client *client = sd->priv; 493 + struct i2c_client *client = v4l2_get_subdevdata(sd); 494 494 struct mt9t031 *mt9t031 = to_mt9t031(client); 495 495 496 496 if (id->match.type != V4L2_CHIP_MATCH_I2C_ADDR) ··· 509 509 static int mt9t031_g_register(struct v4l2_subdev *sd, 510 510 struct v4l2_dbg_register *reg) 511 511 { 512 - struct i2c_client *client = sd->priv; 512 + struct i2c_client *client = v4l2_get_subdevdata(sd); 513 513 514 514 if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff) 515 515 return -EINVAL; ··· 528 528 static int mt9t031_s_register(struct v4l2_subdev *sd, 529 529 struct v4l2_dbg_register *reg) 530 530 { 531 - struct i2c_client *client = sd->priv; 531 + struct i2c_client *client = v4l2_get_subdevdata(sd); 532 532 533 533 if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff) 534 534 return -EINVAL; ··· 545 545 546 546 static int mt9t031_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) 547 547 { 548 - struct i2c_client *client = sd->priv; 548 + struct i2c_client *client = v4l2_get_subdevdata(sd); 549 549 struct mt9t031 *mt9t031 = to_mt9t031(client); 550 550 int data; 551 551 ··· 577 577 578 578 static int mt9t031_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) 579 579 { 580 - struct i2c_client *client = sd->priv; 580 + struct i2c_client *client = v4l2_get_subdevdata(sd); 581 581 struct mt9t031 *mt9t031 = to_mt9t031(client); 582 582 const struct v4l2_queryctrl *qctrl; 583 583 int data; ··· 703 703 struct soc_camera_device *icd = container_of(vdev->parent, 704 704 struct soc_camera_device, dev); 705 705 struct v4l2_subdev *sd = soc_camera_to_subdev(icd); 706 - struct i2c_client *client = sd->priv; 706 + struct i2c_client *client = v4l2_get_subdevdata(sd); 707 707 struct mt9t031 *mt9t031 = to_mt9t031(client); 708 708 709 709 int ret; ··· 780 780 781 781 static int mt9t031_g_skip_top_lines(struct v4l2_subdev *sd, u32 *lines) 782 782 { 783 - struct i2c_client *client = sd->priv; 783 + struct i2c_client *client = v4l2_get_subdevdata(sd); 784 784 struct mt9t031 *mt9t031 = to_mt9t031(client); 785 785 786 786 *lines = mt9t031->y_skip_top;
+7 -7
drivers/media/video/mt9t112.c
··· 804 804 static int mt9t112_g_chip_ident(struct v4l2_subdev *sd, 805 805 struct v4l2_dbg_chip_ident *id) 806 806 { 807 - struct i2c_client *client = sd->priv; 807 + struct i2c_client *client = v4l2_get_subdevdata(sd); 808 808 struct mt9t112_priv *priv = to_mt9t112(client); 809 809 810 810 id->ident = priv->model; ··· 817 817 static int mt9t112_g_register(struct v4l2_subdev *sd, 818 818 struct v4l2_dbg_register *reg) 819 819 { 820 - struct i2c_client *client = sd->priv; 820 + struct i2c_client *client = v4l2_get_subdevdata(sd); 821 821 int ret; 822 822 823 823 reg->size = 2; ··· 831 831 static int mt9t112_s_register(struct v4l2_subdev *sd, 832 832 struct v4l2_dbg_register *reg) 833 833 { 834 - struct i2c_client *client = sd->priv; 834 + struct i2c_client *client = v4l2_get_subdevdata(sd); 835 835 int ret; 836 836 837 837 mt9t112_reg_write(ret, client, reg->reg, reg->val); ··· 858 858 ************************************************************************/ 859 859 static int mt9t112_s_stream(struct v4l2_subdev *sd, int enable) 860 860 { 861 - struct i2c_client *client = sd->priv; 861 + struct i2c_client *client = v4l2_get_subdevdata(sd); 862 862 struct mt9t112_priv *priv = to_mt9t112(client); 863 863 int ret = 0; 864 864 ··· 968 968 969 969 static int mt9t112_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 970 970 { 971 - struct i2c_client *client = sd->priv; 971 + struct i2c_client *client = v4l2_get_subdevdata(sd); 972 972 struct v4l2_rect *rect = &a->c; 973 973 974 974 return mt9t112_set_params(client, rect->width, rect->height, ··· 978 978 static int mt9t112_g_fmt(struct v4l2_subdev *sd, 979 979 struct v4l2_mbus_framefmt *mf) 980 980 { 981 - struct i2c_client *client = sd->priv; 981 + struct i2c_client *client = v4l2_get_subdevdata(sd); 982 982 struct mt9t112_priv *priv = to_mt9t112(client); 983 983 984 984 if (!priv->format) { ··· 1000 1000 static int mt9t112_s_fmt(struct v4l2_subdev *sd, 1001 1001 struct v4l2_mbus_framefmt *mf) 1002 1002 { 1003 - struct i2c_client *client = sd->priv; 1003 + struct i2c_client *client = v4l2_get_subdevdata(sd); 1004 1004 1005 1005 /* TODO: set colorspace */ 1006 1006 return mt9t112_set_params(client, mf->width, mf->height, mf->code);
+13 -13
drivers/media/video/mt9v022.c
··· 184 184 185 185 static int mt9v022_s_stream(struct v4l2_subdev *sd, int enable) 186 186 { 187 - struct i2c_client *client = sd->priv; 187 + struct i2c_client *client = v4l2_get_subdevdata(sd); 188 188 struct mt9v022 *mt9v022 = to_mt9v022(client); 189 189 190 190 if (enable) ··· 273 273 274 274 static int mt9v022_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 275 275 { 276 - struct i2c_client *client = sd->priv; 276 + struct i2c_client *client = v4l2_get_subdevdata(sd); 277 277 struct mt9v022 *mt9v022 = to_mt9v022(client); 278 278 struct v4l2_rect rect = a->c; 279 279 int ret; ··· 334 334 335 335 static int mt9v022_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 336 336 { 337 - struct i2c_client *client = sd->priv; 337 + struct i2c_client *client = v4l2_get_subdevdata(sd); 338 338 struct mt9v022 *mt9v022 = to_mt9v022(client); 339 339 340 340 a->c = mt9v022->rect; ··· 360 360 static int mt9v022_g_fmt(struct v4l2_subdev *sd, 361 361 struct v4l2_mbus_framefmt *mf) 362 362 { 363 - struct i2c_client *client = sd->priv; 363 + struct i2c_client *client = v4l2_get_subdevdata(sd); 364 364 struct mt9v022 *mt9v022 = to_mt9v022(client); 365 365 366 366 mf->width = mt9v022->rect.width; ··· 375 375 static int mt9v022_s_fmt(struct v4l2_subdev *sd, 376 376 struct v4l2_mbus_framefmt *mf) 377 377 { 378 - struct i2c_client *client = sd->priv; 378 + struct i2c_client *client = v4l2_get_subdevdata(sd); 379 379 struct mt9v022 *mt9v022 = to_mt9v022(client); 380 380 struct v4l2_crop a = { 381 381 .c = { ··· 422 422 static int mt9v022_try_fmt(struct v4l2_subdev *sd, 423 423 struct v4l2_mbus_framefmt *mf) 424 424 { 425 - struct i2c_client *client = sd->priv; 425 + struct i2c_client *client = v4l2_get_subdevdata(sd); 426 426 struct mt9v022 *mt9v022 = to_mt9v022(client); 427 427 const struct mt9v022_datafmt *fmt; 428 428 int align = mf->code == V4L2_MBUS_FMT_SBGGR8_1X8 || ··· 448 448 static int mt9v022_g_chip_ident(struct v4l2_subdev *sd, 449 449 struct v4l2_dbg_chip_ident *id) 450 450 { 451 - struct i2c_client *client = sd->priv; 451 + struct i2c_client *client = v4l2_get_subdevdata(sd); 452 452 struct mt9v022 *mt9v022 = to_mt9v022(client); 453 453 454 454 if (id->match.type != V4L2_CHIP_MATCH_I2C_ADDR) ··· 467 467 static int mt9v022_g_register(struct v4l2_subdev *sd, 468 468 struct v4l2_dbg_register *reg) 469 469 { 470 - struct i2c_client *client = sd->priv; 470 + struct i2c_client *client = v4l2_get_subdevdata(sd); 471 471 472 472 if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff) 473 473 return -EINVAL; ··· 487 487 static int mt9v022_s_register(struct v4l2_subdev *sd, 488 488 struct v4l2_dbg_register *reg) 489 489 { 490 - struct i2c_client *client = sd->priv; 490 + struct i2c_client *client = v4l2_get_subdevdata(sd); 491 491 492 492 if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff) 493 493 return -EINVAL; ··· 565 565 566 566 static int mt9v022_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) 567 567 { 568 - struct i2c_client *client = sd->priv; 568 + struct i2c_client *client = v4l2_get_subdevdata(sd); 569 569 const struct v4l2_queryctrl *qctrl; 570 570 unsigned long range; 571 571 int data; ··· 622 622 static int mt9v022_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) 623 623 { 624 624 int data; 625 - struct i2c_client *client = sd->priv; 625 + struct i2c_client *client = v4l2_get_subdevdata(sd); 626 626 const struct v4l2_queryctrl *qctrl; 627 627 628 628 qctrl = soc_camera_find_qctrl(&mt9v022_ops, ctrl->id); ··· 817 817 818 818 static int mt9v022_g_skip_top_lines(struct v4l2_subdev *sd, u32 *lines) 819 819 { 820 - struct i2c_client *client = sd->priv; 820 + struct i2c_client *client = v4l2_get_subdevdata(sd); 821 821 struct mt9v022 *mt9v022 = to_mt9v022(client); 822 822 823 823 *lines = mt9v022->y_skip_top; ··· 838 838 static int mt9v022_enum_fmt(struct v4l2_subdev *sd, unsigned int index, 839 839 enum v4l2_mbus_pixelcode *code) 840 840 { 841 - struct i2c_client *client = sd->priv; 841 + struct i2c_client *client = v4l2_get_subdevdata(sd); 842 842 struct mt9v022 *mt9v022 = to_mt9v022(client); 843 843 844 844 if (index >= mt9v022->num_fmts)
+9 -9
drivers/media/video/ov772x.c
··· 599 599 600 600 static int ov772x_s_stream(struct v4l2_subdev *sd, int enable) 601 601 { 602 - struct i2c_client *client = sd->priv; 602 + struct i2c_client *client = v4l2_get_subdevdata(sd); 603 603 struct ov772x_priv *priv = to_ov772x(client); 604 604 605 605 if (!enable) { ··· 645 645 646 646 static int ov772x_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) 647 647 { 648 - struct i2c_client *client = sd->priv; 648 + struct i2c_client *client = v4l2_get_subdevdata(sd); 649 649 struct ov772x_priv *priv = to_ov772x(client); 650 650 651 651 switch (ctrl->id) { ··· 664 664 665 665 static int ov772x_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) 666 666 { 667 - struct i2c_client *client = sd->priv; 667 + struct i2c_client *client = v4l2_get_subdevdata(sd); 668 668 struct ov772x_priv *priv = to_ov772x(client); 669 669 int ret = 0; 670 670 u8 val; ··· 715 715 static int ov772x_g_chip_ident(struct v4l2_subdev *sd, 716 716 struct v4l2_dbg_chip_ident *id) 717 717 { 718 - struct i2c_client *client = sd->priv; 718 + struct i2c_client *client = v4l2_get_subdevdata(sd); 719 719 struct ov772x_priv *priv = to_ov772x(client); 720 720 721 721 id->ident = priv->model; ··· 728 728 static int ov772x_g_register(struct v4l2_subdev *sd, 729 729 struct v4l2_dbg_register *reg) 730 730 { 731 - struct i2c_client *client = sd->priv; 731 + struct i2c_client *client = v4l2_get_subdevdata(sd); 732 732 int ret; 733 733 734 734 reg->size = 1; ··· 747 747 static int ov772x_s_register(struct v4l2_subdev *sd, 748 748 struct v4l2_dbg_register *reg) 749 749 { 750 - struct i2c_client *client = sd->priv; 750 + struct i2c_client *client = v4l2_get_subdevdata(sd); 751 751 752 752 if (reg->reg > 0xff || 753 753 reg->val > 0xff) ··· 954 954 static int ov772x_g_fmt(struct v4l2_subdev *sd, 955 955 struct v4l2_mbus_framefmt *mf) 956 956 { 957 - struct i2c_client *client = sd->priv; 957 + struct i2c_client *client = v4l2_get_subdevdata(sd); 958 958 struct ov772x_priv *priv = to_ov772x(client); 959 959 960 960 if (!priv->win || !priv->cfmt) { ··· 977 977 static int ov772x_s_fmt(struct v4l2_subdev *sd, 978 978 struct v4l2_mbus_framefmt *mf) 979 979 { 980 - struct i2c_client *client = sd->priv; 980 + struct i2c_client *client = v4l2_get_subdevdata(sd); 981 981 struct ov772x_priv *priv = to_ov772x(client); 982 982 int ret = ov772x_set_params(client, &mf->width, &mf->height, 983 983 mf->code); ··· 991 991 static int ov772x_try_fmt(struct v4l2_subdev *sd, 992 992 struct v4l2_mbus_framefmt *mf) 993 993 { 994 - struct i2c_client *client = sd->priv; 994 + struct i2c_client *client = v4l2_get_subdevdata(sd); 995 995 struct ov772x_priv *priv = to_ov772x(client); 996 996 const struct ov772x_win_size *win; 997 997 int i;
+6 -6
drivers/media/video/ov9640.c
··· 308 308 /* Get status of additional camera capabilities */ 309 309 static int ov9640_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) 310 310 { 311 - struct i2c_client *client = sd->priv; 311 + struct i2c_client *client = v4l2_get_subdevdata(sd); 312 312 struct ov9640_priv *priv = container_of(i2c_get_clientdata(client), 313 313 struct ov9640_priv, subdev); 314 314 ··· 326 326 /* Set status of additional camera capabilities */ 327 327 static int ov9640_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) 328 328 { 329 - struct i2c_client *client = sd->priv; 329 + struct i2c_client *client = v4l2_get_subdevdata(sd); 330 330 struct ov9640_priv *priv = container_of(i2c_get_clientdata(client), 331 331 struct ov9640_priv, subdev); 332 332 ··· 360 360 static int ov9640_g_chip_ident(struct v4l2_subdev *sd, 361 361 struct v4l2_dbg_chip_ident *id) 362 362 { 363 - struct i2c_client *client = sd->priv; 363 + struct i2c_client *client = v4l2_get_subdevdata(sd); 364 364 struct ov9640_priv *priv = container_of(i2c_get_clientdata(client), 365 365 struct ov9640_priv, subdev); 366 366 ··· 374 374 static int ov9640_get_register(struct v4l2_subdev *sd, 375 375 struct v4l2_dbg_register *reg) 376 376 { 377 - struct i2c_client *client = sd->priv; 377 + struct i2c_client *client = v4l2_get_subdevdata(sd); 378 378 int ret; 379 379 u8 val; 380 380 ··· 395 395 static int ov9640_set_register(struct v4l2_subdev *sd, 396 396 struct v4l2_dbg_register *reg) 397 397 { 398 - struct i2c_client *client = sd->priv; 398 + struct i2c_client *client = v4l2_get_subdevdata(sd); 399 399 400 400 if (reg->reg & ~0xff || reg->val & ~0xff) 401 401 return -EINVAL; ··· 558 558 static int ov9640_s_fmt(struct v4l2_subdev *sd, 559 559 struct v4l2_mbus_framefmt *mf) 560 560 { 561 - struct i2c_client *client = sd->priv; 561 + struct i2c_client *client = v4l2_get_subdevdata(sd); 562 562 struct ov9640_reg_alt alts = {0}; 563 563 enum v4l2_colorspace cspace; 564 564 enum v4l2_mbus_pixelcode code = mf->code;
+13 -13
drivers/media/video/rj54n1cb0c.c
··· 493 493 494 494 static int rj54n1_s_stream(struct v4l2_subdev *sd, int enable) 495 495 { 496 - struct i2c_client *client = sd->priv; 496 + struct i2c_client *client = v4l2_get_subdevdata(sd); 497 497 498 498 /* Switch between preview and still shot modes */ 499 499 return reg_set(client, RJ54N1_STILL_CONTROL, (!enable) << 7, 0x80); ··· 503 503 unsigned long flags) 504 504 { 505 505 struct v4l2_subdev *sd = soc_camera_to_subdev(icd); 506 - struct i2c_client *client = sd->priv; 506 + struct i2c_client *client = v4l2_get_subdevdata(sd); 507 507 /* Figures 2.5-1 to 2.5-3 - default falling pixclk edge */ 508 508 509 509 if (flags & SOCAM_PCLK_SAMPLE_RISING) ··· 560 560 561 561 static int rj54n1_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 562 562 { 563 - struct i2c_client *client = sd->priv; 563 + struct i2c_client *client = v4l2_get_subdevdata(sd); 564 564 struct rj54n1 *rj54n1 = to_rj54n1(client); 565 565 struct v4l2_rect *rect = &a->c; 566 566 int dummy = 0, output_w, output_h, ··· 595 595 596 596 static int rj54n1_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 597 597 { 598 - struct i2c_client *client = sd->priv; 598 + struct i2c_client *client = v4l2_get_subdevdata(sd); 599 599 struct rj54n1 *rj54n1 = to_rj54n1(client); 600 600 601 601 a->c = rj54n1->rect; ··· 621 621 static int rj54n1_g_fmt(struct v4l2_subdev *sd, 622 622 struct v4l2_mbus_framefmt *mf) 623 623 { 624 - struct i2c_client *client = sd->priv; 624 + struct i2c_client *client = v4l2_get_subdevdata(sd); 625 625 struct rj54n1 *rj54n1 = to_rj54n1(client); 626 626 627 627 mf->code = rj54n1->fmt->code; ··· 641 641 static int rj54n1_sensor_scale(struct v4l2_subdev *sd, s32 *in_w, s32 *in_h, 642 642 s32 *out_w, s32 *out_h) 643 643 { 644 - struct i2c_client *client = sd->priv; 644 + struct i2c_client *client = v4l2_get_subdevdata(sd); 645 645 struct rj54n1 *rj54n1 = to_rj54n1(client); 646 646 unsigned int skip, resize, input_w = *in_w, input_h = *in_h, 647 647 output_w = *out_w, output_h = *out_h; ··· 983 983 static int rj54n1_try_fmt(struct v4l2_subdev *sd, 984 984 struct v4l2_mbus_framefmt *mf) 985 985 { 986 - struct i2c_client *client = sd->priv; 986 + struct i2c_client *client = v4l2_get_subdevdata(sd); 987 987 struct rj54n1 *rj54n1 = to_rj54n1(client); 988 988 const struct rj54n1_datafmt *fmt; 989 989 int align = mf->code == V4L2_MBUS_FMT_SBGGR10_1X10 || ··· 1014 1014 static int rj54n1_s_fmt(struct v4l2_subdev *sd, 1015 1015 struct v4l2_mbus_framefmt *mf) 1016 1016 { 1017 - struct i2c_client *client = sd->priv; 1017 + struct i2c_client *client = v4l2_get_subdevdata(sd); 1018 1018 struct rj54n1 *rj54n1 = to_rj54n1(client); 1019 1019 const struct rj54n1_datafmt *fmt; 1020 1020 int output_w, output_h, max_w, max_h, ··· 1145 1145 static int rj54n1_g_chip_ident(struct v4l2_subdev *sd, 1146 1146 struct v4l2_dbg_chip_ident *id) 1147 1147 { 1148 - struct i2c_client *client = sd->priv; 1148 + struct i2c_client *client = v4l2_get_subdevdata(sd); 1149 1149 1150 1150 if (id->match.type != V4L2_CHIP_MATCH_I2C_ADDR) 1151 1151 return -EINVAL; ··· 1163 1163 static int rj54n1_g_register(struct v4l2_subdev *sd, 1164 1164 struct v4l2_dbg_register *reg) 1165 1165 { 1166 - struct i2c_client *client = sd->priv; 1166 + struct i2c_client *client = v4l2_get_subdevdata(sd); 1167 1167 1168 1168 if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || 1169 1169 reg->reg < 0x400 || reg->reg > 0x1fff) ··· 1185 1185 static int rj54n1_s_register(struct v4l2_subdev *sd, 1186 1186 struct v4l2_dbg_register *reg) 1187 1187 { 1188 - struct i2c_client *client = sd->priv; 1188 + struct i2c_client *client = v4l2_get_subdevdata(sd); 1189 1189 1190 1190 if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || 1191 1191 reg->reg < 0x400 || reg->reg > 0x1fff) ··· 1248 1248 1249 1249 static int rj54n1_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) 1250 1250 { 1251 - struct i2c_client *client = sd->priv; 1251 + struct i2c_client *client = v4l2_get_subdevdata(sd); 1252 1252 struct rj54n1 *rj54n1 = to_rj54n1(client); 1253 1253 int data; 1254 1254 ··· 1283 1283 static int rj54n1_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) 1284 1284 { 1285 1285 int data; 1286 - struct i2c_client *client = sd->priv; 1286 + struct i2c_client *client = v4l2_get_subdevdata(sd); 1287 1287 struct rj54n1 *rj54n1 = to_rj54n1(client); 1288 1288 const struct v4l2_queryctrl *qctrl; 1289 1289
+1 -1
drivers/media/video/soc_camera.c
··· 902 902 if (!subdev) 903 903 goto ei2cnd; 904 904 905 - client = subdev->priv; 905 + client = v4l2_get_subdevdata(subdev); 906 906 907 907 /* Use to_i2c_client(dev) to recover the i2c client */ 908 908 dev_set_drvdata(&icd->dev, &client->dev);
+10 -10
drivers/media/video/tw9910.c
··· 469 469 */ 470 470 static int tw9910_s_stream(struct v4l2_subdev *sd, int enable) 471 471 { 472 - struct i2c_client *client = sd->priv; 472 + struct i2c_client *client = v4l2_get_subdevdata(sd); 473 473 struct tw9910_priv *priv = to_tw9910(client); 474 474 u8 val; 475 475 int ret; ··· 511 511 unsigned long flags) 512 512 { 513 513 struct v4l2_subdev *sd = soc_camera_to_subdev(icd); 514 - struct i2c_client *client = sd->priv; 514 + struct i2c_client *client = v4l2_get_subdevdata(sd); 515 515 u8 val = VSSL_VVALID | HSSL_DVALID; 516 516 517 517 /* ··· 565 565 static int tw9910_g_chip_ident(struct v4l2_subdev *sd, 566 566 struct v4l2_dbg_chip_ident *id) 567 567 { 568 - struct i2c_client *client = sd->priv; 568 + struct i2c_client *client = v4l2_get_subdevdata(sd); 569 569 struct tw9910_priv *priv = to_tw9910(client); 570 570 571 571 id->ident = V4L2_IDENT_TW9910; ··· 578 578 static int tw9910_g_register(struct v4l2_subdev *sd, 579 579 struct v4l2_dbg_register *reg) 580 580 { 581 - struct i2c_client *client = sd->priv; 581 + struct i2c_client *client = v4l2_get_subdevdata(sd); 582 582 int ret; 583 583 584 584 if (reg->reg > 0xff) ··· 600 600 static int tw9910_s_register(struct v4l2_subdev *sd, 601 601 struct v4l2_dbg_register *reg) 602 602 { 603 - struct i2c_client *client = sd->priv; 603 + struct i2c_client *client = v4l2_get_subdevdata(sd); 604 604 605 605 if (reg->reg > 0xff || 606 606 reg->val > 0xff) ··· 613 613 static int tw9910_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 614 614 { 615 615 struct v4l2_rect *rect = &a->c; 616 - struct i2c_client *client = sd->priv; 616 + struct i2c_client *client = v4l2_get_subdevdata(sd); 617 617 struct tw9910_priv *priv = to_tw9910(client); 618 618 struct soc_camera_device *icd = client->dev.platform_data; 619 619 int ret = -EINVAL; ··· 701 701 702 702 static int tw9910_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 703 703 { 704 - struct i2c_client *client = sd->priv; 704 + struct i2c_client *client = v4l2_get_subdevdata(sd); 705 705 struct tw9910_priv *priv = to_tw9910(client); 706 706 707 707 if (!priv->scale) { ··· 748 748 static int tw9910_g_fmt(struct v4l2_subdev *sd, 749 749 struct v4l2_mbus_framefmt *mf) 750 750 { 751 - struct i2c_client *client = sd->priv; 751 + struct i2c_client *client = v4l2_get_subdevdata(sd); 752 752 struct tw9910_priv *priv = to_tw9910(client); 753 753 754 754 if (!priv->scale) { ··· 778 778 static int tw9910_s_fmt(struct v4l2_subdev *sd, 779 779 struct v4l2_mbus_framefmt *mf) 780 780 { 781 - struct i2c_client *client = sd->priv; 781 + struct i2c_client *client = v4l2_get_subdevdata(sd); 782 782 struct tw9910_priv *priv = to_tw9910(client); 783 783 /* See tw9910_s_crop() - no proper cropping support */ 784 784 struct v4l2_crop a = { ··· 813 813 static int tw9910_try_fmt(struct v4l2_subdev *sd, 814 814 struct v4l2_mbus_framefmt *mf) 815 815 { 816 - struct i2c_client *client = sd->priv; 816 + struct i2c_client *client = v4l2_get_subdevdata(sd); 817 817 struct soc_camera_device *icd = client->dev.platform_data; 818 818 const struct tw9910_scale_ctrl *scale; 819 819