Re: [U-Boot] [PATCH v4 2/2] mucmc52, uc101: delete ata@3a00 node, if no CF card is detected

Hello Stefan,

Stefan Roese wrote:

On Monday 14 September 2009 17:26:45 Heiko Schocher wrote:

[...]

...

...

...

do_fixup_by_path_u32(blob, cpu_path, "timebase-frequency", OF_TBCLK, 1); do_fixup_by_path_u32(blob, cpu_path, "bus-frequency", bd->bi_busfreq, 1); @@ -137,6 +140,21 @@ void ft_cpu_setup(void *blob, bd_t *bd) do_fixup_by_path(blob, eth_path, "mac-address", enetaddr, 6, 0); do_fixup_by_path(blob, eth_path, "local-mac-address", enetaddr, 6, 0); #endif +#if defined(CONFIG_OF_IDE_FIXUP)

• if (ide_dev_desc[0].type == DEV_TYPE_UNKNOWN) {

• /* NO CF card detected -> delete ata node in DTS */
  

• int nodeoffset = 0;
  

• char nodename[] = "/soc5200@f0000000/ata@3a00";
  

• nodeoffset = fdt_path_offset (blob, nodename);
  

• if (nodeoffset >= 0) {
  

• 	fdt_del_node(blob, nodeoffset);
  

• } else
  

• 	printf("%s: cannot find %s node err:%s\n",
  

• 		__func__, nodename, fdt_strerror(nodeoffset));
  

Incorrect multi-line parentheses:

if (nodeoffset >= 0) {
	fdt_del_node(blob, nodeoffset);
} else {
	printf("%s: cannot find %s node err:%s\n",
		__func__, nodename, fdt_strerror(nodeoffset));
}

            if (nodeoffset >= 0)
                    fdt_del_node(blob, nodeoffset);
            else
                    printf("%s: cannot find %s node err:%s\n",
                            __func__, nodename,

fdt_strerror(nodeoffset));

Should be right, or?

No. IIRC, then when one of the statements is a multi-line statement, both statements of the if/else struct should have the parentheses.

I see only one statement in the if and the else case ...

bye Heiko