diff options
author | Michal Simek <michal.simek@xilinx.com> | 2013-10-10 02:30:20 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-10-11 01:56:54 -0400 |
commit | 353846fb8bb7d84986116a5be110eefed451af3c (patch) | |
tree | dfcc22c078f48382ad0aecb343cb0bb52f35bada | |
parent | 9b5254b4604d358e64d1798544e242f67a81c106 (diff) |
video: xilinxfb: Use standard variable name convention
s/op/pdev/ in xilinxfb_of_probe().
No functional chagnes.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r-- | drivers/video/xilinxfb.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c index 0e1dd3380a1e..d12345f7fca4 100644 --- a/drivers/video/xilinxfb.c +++ b/drivers/video/xilinxfb.c | |||
@@ -411,7 +411,7 @@ static int xilinxfb_release(struct device *dev) | |||
411 | * OF bus binding | 411 | * OF bus binding |
412 | */ | 412 | */ |
413 | 413 | ||
414 | static int xilinxfb_of_probe(struct platform_device *op) | 414 | static int xilinxfb_of_probe(struct platform_device *pdev) |
415 | { | 415 | { |
416 | const u32 *prop; | 416 | const u32 *prop; |
417 | u32 tft_access = 0; | 417 | u32 tft_access = 0; |
@@ -425,7 +425,7 @@ static int xilinxfb_of_probe(struct platform_device *op) | |||
425 | /* Allocate the driver data region */ | 425 | /* Allocate the driver data region */ |
426 | drvdata = kzalloc(sizeof(*drvdata), GFP_KERNEL); | 426 | drvdata = kzalloc(sizeof(*drvdata), GFP_KERNEL); |
427 | if (!drvdata) { | 427 | if (!drvdata) { |
428 | dev_err(&op->dev, "Couldn't allocate device private record\n"); | 428 | dev_err(&pdev->dev, "Couldn't allocate device private record\n"); |
429 | return -ENOMEM; | 429 | return -ENOMEM; |
430 | } | 430 | } |
431 | 431 | ||
@@ -433,7 +433,7 @@ static int xilinxfb_of_probe(struct platform_device *op) | |||
433 | * To check whether the core is connected directly to DCR or BUS | 433 | * To check whether the core is connected directly to DCR or BUS |
434 | * interface and initialize the tft_access accordingly. | 434 | * interface and initialize the tft_access accordingly. |
435 | */ | 435 | */ |
436 | of_property_read_u32(op->dev.of_node, "xlnx,dcr-splb-slave-if", | 436 | of_property_read_u32(pdev->dev.of_node, "xlnx,dcr-splb-slave-if", |
437 | &tft_access); | 437 | &tft_access); |
438 | 438 | ||
439 | /* | 439 | /* |
@@ -457,29 +457,29 @@ static int xilinxfb_of_probe(struct platform_device *op) | |||
457 | } | 457 | } |
458 | #endif | 458 | #endif |
459 | 459 | ||
460 | prop = of_get_property(op->dev.of_node, "phys-size", &size); | 460 | prop = of_get_property(pdev->dev.of_node, "phys-size", &size); |
461 | if ((prop) && (size >= sizeof(u32)*2)) { | 461 | if ((prop) && (size >= sizeof(u32)*2)) { |
462 | pdata.screen_width_mm = prop[0]; | 462 | pdata.screen_width_mm = prop[0]; |
463 | pdata.screen_height_mm = prop[1]; | 463 | pdata.screen_height_mm = prop[1]; |
464 | } | 464 | } |
465 | 465 | ||
466 | prop = of_get_property(op->dev.of_node, "resolution", &size); | 466 | prop = of_get_property(pdev->dev.of_node, "resolution", &size); |
467 | if ((prop) && (size >= sizeof(u32)*2)) { | 467 | if ((prop) && (size >= sizeof(u32)*2)) { |
468 | pdata.xres = prop[0]; | 468 | pdata.xres = prop[0]; |
469 | pdata.yres = prop[1]; | 469 | pdata.yres = prop[1]; |
470 | } | 470 | } |
471 | 471 | ||
472 | prop = of_get_property(op->dev.of_node, "virtual-resolution", &size); | 472 | prop = of_get_property(pdev->dev.of_node, "virtual-resolution", &size); |
473 | if ((prop) && (size >= sizeof(u32)*2)) { | 473 | if ((prop) && (size >= sizeof(u32)*2)) { |
474 | pdata.xvirt = prop[0]; | 474 | pdata.xvirt = prop[0]; |
475 | pdata.yvirt = prop[1]; | 475 | pdata.yvirt = prop[1]; |
476 | } | 476 | } |
477 | 477 | ||
478 | if (of_find_property(op->dev.of_node, "rotate-display", NULL)) | 478 | if (of_find_property(pdev->dev.of_node, "rotate-display", NULL)) |
479 | pdata.rotate_screen = 1; | 479 | pdata.rotate_screen = 1; |
480 | 480 | ||
481 | dev_set_drvdata(&op->dev, drvdata); | 481 | dev_set_drvdata(&pdev->dev, drvdata); |
482 | return xilinxfb_assign(op, drvdata, &pdata); | 482 | return xilinxfb_assign(pdev, drvdata, &pdata); |
483 | } | 483 | } |
484 | 484 | ||
485 | static int xilinxfb_of_remove(struct platform_device *op) | 485 | static int xilinxfb_of_remove(struct platform_device *op) |