diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2006-07-12 01:40:40 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 01:55:05 -0400 |
commit | b04e3dd4ab4c7763a4ca8f751caaf69ce8dabbba (patch) | |
tree | 0224891d9ea4bfa4b1b8245d498cf2fa81737884 /drivers/video/riva | |
parent | 018a3d1db7cdb6127656c1622ee1d2302e16436d (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/riva')
-rw-r--r-- | drivers/video/riva/fbdev.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c index 2788655e6e7d..6a30c0ca1de0 100644 --- a/drivers/video/riva/fbdev.c +++ b/drivers/video/riva/fbdev.c | |||
@@ -1816,14 +1816,13 @@ static int __devinit riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd) | |||
1816 | NVTRACE_ENTER(); | 1816 | NVTRACE_ENTER(); |
1817 | dp = pci_device_to_OF_node(pd); | 1817 | dp = pci_device_to_OF_node(pd); |
1818 | for (; dp != NULL; dp = dp->child) { | 1818 | for (; dp != NULL; dp = dp->child) { |
1819 | disptype = (unsigned char *)get_property(dp, "display-type", NULL); | 1819 | disptype = get_property(dp, "display-type", NULL); |
1820 | if (disptype == NULL) | 1820 | if (disptype == NULL) |
1821 | continue; | 1821 | continue; |
1822 | if (strncmp(disptype, "LCD", 3) != 0) | 1822 | if (strncmp(disptype, "LCD", 3) != 0) |
1823 | continue; | 1823 | continue; |
1824 | for (i = 0; propnames[i] != NULL; ++i) { | 1824 | for (i = 0; propnames[i] != NULL; ++i) { |
1825 | pedid = (unsigned char *) | 1825 | pedid = get_property(dp, propnames[i], NULL); |
1826 | get_property(dp, propnames[i], NULL); | ||
1827 | if (pedid != NULL) { | 1826 | if (pedid != NULL) { |
1828 | par->EDID = pedid; | 1827 | par->EDID = pedid; |
1829 | NVTRACE("LCD found.\n"); | 1828 | NVTRACE("LCD found.\n"); |