Commit 0806a13c authored by Lubomir Rintel's avatar Lubomir Rintel Committed by Sebastian Reichel
Browse files

x86/platform/olpc: Don't split string literals when fixing up the DT 



It was pointed out in a review, and checkpatch.pl complains about this.
Breaking it down into multiple ofw evaluations works just as well and
reads better.

Signed-off-by: default avatarLubomir Rintel <lkundrak@v3.sk>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent d25ad7fd

arch/x86/platform/olpc/olpc_dt.c

+19 −14
Original line number Diff line number Diff line
@@ -242,9 +242,9 @@ void __init olpc_dt_fixup(void) 
	pr_info("PROM DT: Old firmware detected, applying fixes\n");



	/* Add olpc,xo1-battery compatible marker to battery node */

	olpc_dt_interpret("\" /battery@0\" find-device"

		" \" olpc,xo1-battery\" +compatible"

		" device-end");

	olpc_dt_interpret("\" /battery@0\" find-device");

	olpc_dt_interpret("  \" olpc,xo1-battery\" +compatible");

	olpc_dt_interpret("device-end");



	board_rev = olpc_dt_get_board_revision();

	if (!board_rev)
@@ -252,19 +252,24 @@ void __init olpc_dt_fixup(void) 


	if (board_rev >= olpc_board_pre(0xd0)) {

		/* XO-1.5: add dcon device */

		olpc_dt_interpret("\" /pci/display@1\" find-device"

			" new-device"

			" \" dcon\" device-name \" olpc,xo1-dcon\" +compatible"

			" finish-device device-end");

		olpc_dt_interpret("\" /pci/display@1\" find-device");

		olpc_dt_interpret("  new-device");

		olpc_dt_interpret("    \" dcon\" device-name");

		olpc_dt_interpret("    \" olpc,xo1-dcon\" +compatible");

		olpc_dt_interpret("  finish-device");

		olpc_dt_interpret("device-end");

	} else {

		/* XO-1: add dcon device, mark RTC as olpc,xo1-rtc */

		olpc_dt_interpret("\" /pci/display@1,1\" find-device"

			" new-device"

			" \" dcon\" device-name \" olpc,xo1-dcon\" +compatible"

			" finish-device device-end"

			" \" /rtc\" find-device"

			" \" olpc,xo1-rtc\" +compatible"

			" device-end");

		olpc_dt_interpret("\" /pci/display@1,1\" find-device");

		olpc_dt_interpret("  new-device");

		olpc_dt_interpret("    \" dcon\" device-name");

		olpc_dt_interpret("    \" olpc,xo1-dcon\" +compatible");

		olpc_dt_interpret("  finish-device");

		olpc_dt_interpret("device-end");



		olpc_dt_interpret("\" /rtc\" find-device");

		olpc_dt_interpret(" \" olpc,xo1-rtc\" +compatible");

		olpc_dt_interpret("device-end");

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE