diff options
Diffstat (limited to 'drivers/video/offb.c')
-rw-r--r-- | drivers/video/offb.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/video/offb.c b/drivers/video/offb.c index 0013311e0564..bad0e98fb3b6 100644 --- a/drivers/video/offb.c +++ b/drivers/video/offb.c | |||
@@ -409,30 +409,30 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node) | |||
409 | unsigned int flags, rsize, addr_prop = 0; | 409 | unsigned int flags, rsize, addr_prop = 0; |
410 | unsigned long max_size = 0; | 410 | unsigned long max_size = 0; |
411 | u64 rstart, address = OF_BAD_ADDR; | 411 | u64 rstart, address = OF_BAD_ADDR; |
412 | u32 *pp, *addrp, *up; | 412 | const u32 *pp, *addrp, *up; |
413 | u64 asize; | 413 | u64 asize; |
414 | 414 | ||
415 | pp = (u32 *)get_property(dp, "linux,bootx-depth", &len); | 415 | pp = get_property(dp, "linux,bootx-depth", &len); |
416 | if (pp == NULL) | 416 | if (pp == NULL) |
417 | pp = (u32 *)get_property(dp, "depth", &len); | 417 | pp = get_property(dp, "depth", &len); |
418 | if (pp && len == sizeof(u32)) | 418 | if (pp && len == sizeof(u32)) |
419 | depth = *pp; | 419 | depth = *pp; |
420 | 420 | ||
421 | pp = (u32 *)get_property(dp, "linux,bootx-width", &len); | 421 | pp = get_property(dp, "linux,bootx-width", &len); |
422 | if (pp == NULL) | 422 | if (pp == NULL) |
423 | pp = (u32 *)get_property(dp, "width", &len); | 423 | pp = get_property(dp, "width", &len); |
424 | if (pp && len == sizeof(u32)) | 424 | if (pp && len == sizeof(u32)) |
425 | width = *pp; | 425 | width = *pp; |
426 | 426 | ||
427 | pp = (u32 *)get_property(dp, "linux,bootx-height", &len); | 427 | pp = get_property(dp, "linux,bootx-height", &len); |
428 | if (pp == NULL) | 428 | if (pp == NULL) |
429 | pp = (u32 *)get_property(dp, "height", &len); | 429 | pp = get_property(dp, "height", &len); |
430 | if (pp && len == sizeof(u32)) | 430 | if (pp && len == sizeof(u32)) |
431 | height = *pp; | 431 | height = *pp; |
432 | 432 | ||
433 | pp = (u32 *)get_property(dp, "linux,bootx-linebytes", &len); | 433 | pp = get_property(dp, "linux,bootx-linebytes", &len); |
434 | if (pp == NULL) | 434 | if (pp == NULL) |
435 | pp = (u32 *)get_property(dp, "linebytes", &len); | 435 | pp = get_property(dp, "linebytes", &len); |
436 | if (pp && len == sizeof(u32)) | 436 | if (pp && len == sizeof(u32)) |
437 | pitch = *pp; | 437 | pitch = *pp; |
438 | else | 438 | else |
@@ -450,9 +450,9 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node) | |||
450 | * ranges and pick one that is both big enough and if possible encloses | 450 | * ranges and pick one that is both big enough and if possible encloses |
451 | * the "address" property. If none match, we pick the biggest | 451 | * the "address" property. If none match, we pick the biggest |
452 | */ | 452 | */ |
453 | up = (u32 *)get_property(dp, "linux,bootx-addr", &len); | 453 | up = get_property(dp, "linux,bootx-addr", &len); |
454 | if (up == NULL) | 454 | if (up == NULL) |
455 | up = (u32 *)get_property(dp, "address", &len); | 455 | up = get_property(dp, "address", &len); |
456 | if (up && len == sizeof(u32)) | 456 | if (up && len == sizeof(u32)) |
457 | addr_prop = *up; | 457 | addr_prop = *up; |
458 | 458 | ||