Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13b5aecc authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] more fallout from get_property returning pointer to const 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d7b20045

arch/powerpc/platforms/powermac/feature.c

+2 −2
Original line number Diff line number Diff line
@@ -1058,8 +1058,8 @@ core99_reset_cpu(struct device_node *node, long param, long value) 
	if (np == NULL)

		return -ENODEV;

	for (np = np->child; np != NULL; np = np->sibling) {

		u32 *num = get_property(np, "reg", NULL);

		u32 *rst = get_property(np, "soft-reset", NULL);

		const u32 *num = get_property(np, "reg", NULL);

		const u32 *rst = get_property(np, "soft-reset", NULL);

		if (num == NULL || rst == NULL)

			continue;

		if (param == *num) {

arch/powerpc/platforms/powermac/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -702,7 +702,7 @@ static void __init smp_core99_setup(int ncpus) 
	/* GPIO based HW sync on ppc32 Core99 */

	if (pmac_tb_freeze == NULL && !machine_is_compatible("MacRISC4")) {

		struct device_node *cpu;

		u32 *tbprop = NULL;

		const u32 *tbprop = NULL;



		core99_tb_gpio = KL_GPIO_TB_ENABLE;	/* default value */

		cpu = of_find_node_by_type(NULL, "cpu");

drivers/char/briq_panel.c

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static struct miscdevice briq_panel_miscdev = { 
static int __init briq_panel_init(void)

{

	struct device_node *root = find_path_device("/");

	char *machine;

	const char *machine;

	int i;



	machine = get_property(root, "model", NULL);

drivers/video/riva/fbdev.c

+1 −1
Original line number Diff line number Diff line
@@ -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 device_node *dp;

	unsigned char *pedid = NULL;

	unsigned char *disptype = NULL;

	const unsigned char *disptype = NULL;

	static char *propnames[] = {

		"DFP,EDID", "LCD,EDID", "EDID", "EDID1", "EDID,B", "EDID,A", NULL };

	int i;