Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 34055
b: refs/heads/master
c: b04e3dd
h: refs/heads/master
i:
  34053: a7d2432
  34051: 3c09a31
  34047: 2c5286a
v: v3
  • Loading branch information
Jeremy Kerr authored and Paul Mackerras committed Jul 31, 2006
1 parent b0de6c1 commit 0115ce4
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 42 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 018a3d1db7cdb6127656c1622ee1d2302e16436d
refs/heads/master: b04e3dd4ab4c7763a4ca8f751caaf69ce8dabbba
4 changes: 2 additions & 2 deletions trunk/drivers/char/agp/uninorth-agp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -601,8 +601,8 @@ static int __devinit agp_uninorth_probe(struct pci_dev *pdev,
uninorth_node = of_find_node_by_name(NULL, "u3");
}
if (uninorth_node) {
int *revprop = (int *)
get_property(uninorth_node, "device-rev", NULL);
const int *revprop = get_property(uninorth_node,
"device-rev", NULL);
if (revprop != NULL)
uninorth_rev = *revprop & 0x3f;
of_node_put(uninorth_node);
Expand Down
12 changes: 6 additions & 6 deletions trunk/drivers/video/S3triofb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,30 +350,30 @@ static void __init s3triofb_of_init(struct device_node *dp)
s3trio_name[sizeof(s3trio_name)-1] = '\0';
strcpy(fb_fix.id, s3trio_name);

if((pp = (int *)get_property(dp, "vendor-id", &len)) != NULL
if((pp = get_property(dp, "vendor-id", &len)) != NULL
&& *pp!=PCI_VENDOR_ID_S3) {
printk("%s: can't find S3 Trio board\n", dp->full_name);
return;
}

if((pp = (int *)get_property(dp, "device-id", &len)) != NULL
if((pp = get_property(dp, "device-id", &len)) != NULL
&& *pp!=PCI_DEVICE_ID_S3_TRIO) {
printk("%s: can't find S3 Trio board\n", dp->full_name);
return;
}

if ((pp = (int *)get_property(dp, "depth", &len)) != NULL
if ((pp = get_property(dp, "depth", &len)) != NULL
&& len == sizeof(int) && *pp != 8) {
printk("%s: can't use depth = %d\n", dp->full_name, *pp);
return;
}
if ((pp = (int *)get_property(dp, "width", &len)) != NULL
if ((pp = get_property(dp, "width", &len)) != NULL
&& len == sizeof(int))
fb_var.xres = fb_var.xres_virtual = *pp;
if ((pp = (int *)get_property(dp, "height", &len)) != NULL
if ((pp = get_property(dp, "height", &len)) != NULL
&& len == sizeof(int))
fb_var.yres = fb_var.yres_virtual = *pp;
if ((pp = (int *)get_property(dp, "linebytes", &len)) != NULL
if ((pp = get_property(dp, "linebytes", &len)) != NULL
&& len == sizeof(int))
fb_fix.line_length = *pp;
else
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/video/aty/radeon_base.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,23 +412,23 @@ static int __devinit radeon_find_mem_vbios(struct radeonfb_info *rinfo)
static int __devinit radeon_read_xtal_OF (struct radeonfb_info *rinfo)
{
struct device_node *dp = rinfo->of_node;
u32 *val;
const u32 *val;

if (dp == NULL)
return -ENODEV;
val = (u32 *) get_property(dp, "ATY,RefCLK", NULL);
val = get_property(dp, "ATY,RefCLK", NULL);
if (!val || !*val) {
printk(KERN_WARNING "radeonfb: No ATY,RefCLK property !\n");
return -EINVAL;
}

rinfo->pll.ref_clk = (*val) / 10;

val = (u32 *) get_property(dp, "ATY,SCLK", NULL);
val = get_property(dp, "ATY,SCLK", NULL);
if (val && *val)
rinfo->pll.sclk = (*val) / 10;

val = (u32 *) get_property(dp, "ATY,MCLK", NULL);
val = get_property(dp, "ATY,MCLK", NULL);
if (val && *val)
rinfo->pll.mclk = (*val) / 10;

Expand Down
12 changes: 6 additions & 6 deletions trunk/drivers/video/aty/radeon_monitor.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_
{
static char *propnames[] = { "DFP,EDID", "LCD,EDID", "EDID",
"EDID1", "EDID2", NULL };
u8 *pedid = NULL;
u8 *pmt = NULL;
const u8 *pedid = NULL;
const u8 *pmt = NULL;
u8 *tmp;
int i, mt = MT_NONE;

RTRACE("analyzing OF properties...\n");
pmt = (u8 *)get_property(dp, "display-type", NULL);
pmt = get_property(dp, "display-type", NULL);
if (!pmt)
return MT_NONE;
RTRACE("display-type: %s\n", pmt);
Expand All @@ -89,7 +89,7 @@ static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_
}

for (i = 0; propnames[i] != NULL; ++i) {
pedid = (u8 *)get_property(dp, propnames[i], NULL);
pedid = get_property(dp, propnames[i], NULL);
if (pedid != NULL)
break;
}
Expand Down Expand Up @@ -124,14 +124,14 @@ static int __devinit radeon_probe_OF_head(struct radeonfb_info *rinfo, int head_
return MT_NONE;

if (rinfo->has_CRTC2) {
char *pname;
const char *pname;
int len, second = 0;

dp = dp->child;
do {
if (!dp)
return MT_NONE;
pname = (char *)get_property(dp, "name", NULL);
pname = get_property(dp, "name", NULL);
if (!pname)
return MT_NONE;
len = strlen(pname);
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/video/aty/radeon_pm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1167,7 +1167,7 @@ static void radeon_pm_full_reset_sdram(struct radeonfb_info *rinfo)
0x21320032, 0xa1320032, 0x21320032, 0xffffffff,
0x31320032 };

u32 *mrtable = default_mrtable;
const u32 *mrtable = default_mrtable;
int i, mrtable_size = ARRAY_SIZE(default_mrtable);

mdelay(30);
Expand All @@ -1186,7 +1186,7 @@ static void radeon_pm_full_reset_sdram(struct radeonfb_info *rinfo)
if (rinfo->of_node != NULL) {
int size;

mrtable = (u32 *)get_property(rinfo->of_node, "ATY,MRT", &size);
mrtable = get_property(rinfo->of_node, "ATY,MRT", &size);
if (mrtable)
mrtable_size = size >> 2;
else
Expand Down
12 changes: 5 additions & 7 deletions trunk/drivers/video/nvidia/nv_of.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ int nvidia_probe_of_connector(struct fb_info *info, int conn, u8 **out_edid)
{
struct nvidia_par *par = info->par;
struct device_node *parent, *dp;
unsigned char *pedid = NULL;
const unsigned char *pedid = NULL;
static char *propnames[] = {
"DFP,EDID", "LCD,EDID", "EDID", "EDID1",
"EDID,B", "EDID,A", NULL };
Expand All @@ -42,20 +42,19 @@ int nvidia_probe_of_connector(struct fb_info *info, int conn, u8 **out_edid)
if (parent == NULL)
return -1;
if (par->twoHeads) {
char *pname;
const char *pname;
int len;

for (dp = NULL;
(dp = of_get_next_child(parent, dp)) != NULL;) {
pname = (char *)get_property(dp, "name", NULL);
pname = get_property(dp, "name", NULL);
if (!pname)
continue;
len = strlen(pname);
if ((pname[len-1] == 'A' && conn == 1) ||
(pname[len-1] == 'B' && conn == 2)) {
for (i = 0; propnames[i] != NULL; ++i) {
pedid = (unsigned char *)
get_property(dp, propnames[i],
pedid = get_property(dp, propnames[i],
NULL);
if (pedid != NULL)
break;
Expand All @@ -67,8 +66,7 @@ int nvidia_probe_of_connector(struct fb_info *info, int conn, u8 **out_edid)
}
if (pedid == NULL) {
for (i = 0; propnames[i] != NULL; ++i) {
pedid = (unsigned char *)
get_property(parent, propnames[i], NULL);
pedid = get_property(parent, propnames[i], NULL);
if (pedid != NULL)
break;
}
Expand Down
22 changes: 11 additions & 11 deletions trunk/drivers/video/offb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,30 +410,30 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node)
unsigned int flags, rsize, addr_prop = 0;
unsigned long max_size = 0;
u64 rstart, address = OF_BAD_ADDR;
u32 *pp, *addrp, *up;
const u32 *pp, *addrp, *up;
u64 asize;

pp = (u32 *)get_property(dp, "linux,bootx-depth", &len);
pp = get_property(dp, "linux,bootx-depth", &len);
if (pp == NULL)
pp = (u32 *)get_property(dp, "depth", &len);
pp = get_property(dp, "depth", &len);
if (pp && len == sizeof(u32))
depth = *pp;

pp = (u32 *)get_property(dp, "linux,bootx-width", &len);
pp = get_property(dp, "linux,bootx-width", &len);
if (pp == NULL)
pp = (u32 *)get_property(dp, "width", &len);
pp = get_property(dp, "width", &len);
if (pp && len == sizeof(u32))
width = *pp;

pp = (u32 *)get_property(dp, "linux,bootx-height", &len);
pp = get_property(dp, "linux,bootx-height", &len);
if (pp == NULL)
pp = (u32 *)get_property(dp, "height", &len);
pp = get_property(dp, "height", &len);
if (pp && len == sizeof(u32))
height = *pp;

pp = (u32 *)get_property(dp, "linux,bootx-linebytes", &len);
pp = get_property(dp, "linux,bootx-linebytes", &len);
if (pp == NULL)
pp = (u32 *)get_property(dp, "linebytes", &len);
pp = get_property(dp, "linebytes", &len);
if (pp && len == sizeof(u32))
pitch = *pp;
else
Expand All @@ -451,9 +451,9 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node)
* ranges and pick one that is both big enough and if possible encloses
* the "address" property. If none match, we pick the biggest
*/
up = (u32 *)get_property(dp, "linux,bootx-addr", &len);
up = get_property(dp, "linux,bootx-addr", &len);
if (up == NULL)
up = (u32 *)get_property(dp, "address", &len);
up = get_property(dp, "address", &len);
if (up && len == sizeof(u32))
addr_prop = *up;

Expand Down
5 changes: 2 additions & 3 deletions trunk/drivers/video/riva/fbdev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1816,14 +1816,13 @@ static int __devinit riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd)
NVTRACE_ENTER();
dp = pci_device_to_OF_node(pd);
for (; dp != NULL; dp = dp->child) {
disptype = (unsigned char *)get_property(dp, "display-type", NULL);
disptype = get_property(dp, "display-type", NULL);
if (disptype == NULL)
continue;
if (strncmp(disptype, "LCD", 3) != 0)
continue;
for (i = 0; propnames[i] != NULL; ++i) {
pedid = (unsigned char *)
get_property(dp, propnames[i], NULL);
pedid = get_property(dp, propnames[i], NULL);
if (pedid != NULL) {
par->EDID = pedid;
NVTRACE("LCD found.\n");
Expand Down

0 comments on commit 0115ce4

Please sign in to comment.