aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/S3triofb.c
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2006-07-12 01:40:40 -0400
committerPaul Mackerras <paulus@samba.org>2006-07-31 01:55:05 -0400
commitb04e3dd4ab4c7763a4ca8f751caaf69ce8dabbba (patch)
tree0224891d9ea4bfa4b1b8245d498cf2fa81737884 /drivers/video/S3triofb.c
parent018a3d1db7cdb6127656c1622ee1d2302e16436d (diff)
[POWERPC] video & agp: Constify & voidify get_property()
Now that get_property() returns a void *, there's no need to cast its return value. Also, treat the return value as const, so we can constify get_property later. powerpc-specific video & agp driver changes. Signed-off-by: Jeremy Kerr <jk@ozlabs.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/video/S3triofb.c')
-rw-r--r--drivers/video/S3triofb.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/video/S3triofb.c b/drivers/video/S3triofb.c
index e714e8449c1d..0f2ed75a681f 100644
--- a/drivers/video/S3triofb.c
+++ b/drivers/video/S3triofb.c
@@ -350,30 +350,30 @@ static void __init s3triofb_of_init(struct device_node *dp)
350 s3trio_name[sizeof(s3trio_name)-1] = '\0'; 350 s3trio_name[sizeof(s3trio_name)-1] = '\0';
351 strcpy(fb_fix.id, s3trio_name); 351 strcpy(fb_fix.id, s3trio_name);
352 352
353 if((pp = (int *)get_property(dp, "vendor-id", &len)) != NULL 353 if((pp = get_property(dp, "vendor-id", &len)) != NULL
354 && *pp!=PCI_VENDOR_ID_S3) { 354 && *pp!=PCI_VENDOR_ID_S3) {
355 printk("%s: can't find S3 Trio board\n", dp->full_name); 355 printk("%s: can't find S3 Trio board\n", dp->full_name);
356 return; 356 return;
357 } 357 }
358 358
359 if((pp = (int *)get_property(dp, "device-id", &len)) != NULL 359 if((pp = get_property(dp, "device-id", &len)) != NULL
360 && *pp!=PCI_DEVICE_ID_S3_TRIO) { 360 && *pp!=PCI_DEVICE_ID_S3_TRIO) {
361 printk("%s: can't find S3 Trio board\n", dp->full_name); 361 printk("%s: can't find S3 Trio board\n", dp->full_name);
362 return; 362 return;
363 } 363 }
364 364
365 if ((pp = (int *)get_property(dp, "depth", &len)) != NULL 365 if ((pp = get_property(dp, "depth", &len)) != NULL
366 && len == sizeof(int) && *pp != 8) { 366 && len == sizeof(int) && *pp != 8) {
367 printk("%s: can't use depth = %d\n", dp->full_name, *pp); 367 printk("%s: can't use depth = %d\n", dp->full_name, *pp);
368 return; 368 return;
369 } 369 }
370 if ((pp = (int *)get_property(dp, "width", &len)) != NULL 370 if ((pp = get_property(dp, "width", &len)) != NULL
371 && len == sizeof(int)) 371 && len == sizeof(int))
372 fb_var.xres = fb_var.xres_virtual = *pp; 372 fb_var.xres = fb_var.xres_virtual = *pp;
373 if ((pp = (int *)get_property(dp, "height", &len)) != NULL 373 if ((pp = get_property(dp, "height", &len)) != NULL
374 && len == sizeof(int)) 374 && len == sizeof(int))
375 fb_var.yres = fb_var.yres_virtual = *pp; 375 fb_var.yres = fb_var.yres_virtual = *pp;
376 if ((pp = (int *)get_property(dp, "linebytes", &len)) != NULL 376 if ((pp = get_property(dp, "linebytes", &len)) != NULL
377 && len == sizeof(int)) 377 && len == sizeof(int))
378 fb_fix.line_length = *pp; 378 fb_fix.line_length = *pp;
379 else 379 else