OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] more fallout from get_property returning pointer to const 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Al Viro 2006-09-23 16:44:58 +01:00 committed by Linus Torvalds
parent d7b2004528
commit 13b5aeccc4
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/platforms/powermac/feature.c
View File

@ -1058,8 +1058,8 @@ core99_reset_cpu(struct device_node *node, long param, long value)
if (np == NULL) if (np == NULL)
return -ENODEV; return -ENODEV;
for (np = np->child; np != NULL; np = np->sibling) { for (np = np->child; np != NULL; np = np->sibling) {
u32 *num = get_property(np, "reg", NULL); const u32 *num = get_property(np, "reg", NULL);
u32 *rst = get_property(np, "soft-reset", NULL); const u32 *rst = get_property(np, "soft-reset", NULL);
if (num == NULL || rst == NULL) if (num == NULL || rst == NULL)
continue; continue;
if (param == *num) { if (param == *num) {

2
arch/powerpc/platforms/powermac/smp.c
View File

@ -702,7 +702,7 @@ static void __init smp_core99_setup(int ncpus)
/* GPIO based HW sync on ppc32 Core99 */ /* GPIO based HW sync on ppc32 Core99 */
if (pmac_tb_freeze == NULL && !machine_is_compatible("MacRISC4")) { if (pmac_tb_freeze == NULL && !machine_is_compatible("MacRISC4")) {
struct device_node *cpu; struct device_node *cpu;
u32 *tbprop = NULL; const u32 *tbprop = NULL;
core99_tb_gpio = KL_GPIO_TB_ENABLE; /* default value */ core99_tb_gpio = KL_GPIO_TB_ENABLE; /* default value */
cpu = of_find_node_by_type(NULL, "cpu"); cpu = of_find_node_by_type(NULL, "cpu");

2
drivers/char/briq_panel.c
View File

@ -202,7 +202,7 @@ static struct miscdevice briq_panel_miscdev = {
static int __init briq_panel_init(void) static int __init briq_panel_init(void)
{ {
struct device_node *root = find_path_device("/"); struct device_node *root = find_path_device("/");
char *machine; const char *machine;
int i; int i;
machine = get_property(root, "model", NULL); machine = get_property(root, "model", NULL);

2
drivers/video/riva/fbdev.c
View File

@ -1827,7 +1827,7 @@ static int __devinit riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd)
struct riva_par *par = info->par; struct riva_par *par = info->par;
struct device_node *dp; struct device_node *dp;
unsigned char *pedid = NULL; unsigned char *pedid = NULL;
unsigned char *disptype = NULL; const unsigned char *disptype = NULL;
static char *propnames[] = { static char *propnames[] = {
"DFP,EDID", "LCD,EDID", "EDID", "EDID1", "EDID,B", "EDID,A", NULL }; "DFP,EDID", "LCD,EDID", "EDID", "EDID1", "EDID,B", "EDID,A", NULL };
int i; int i;