Commit 871336a9 authored Mar 13, 2014 by Arnd Bergmann

ARM: at91: fix broken "if () else" statement



If CONFIG_PATA_AT91 is disabled, the code in at91_add_device_cf
is turned into invalid C statements due to the lack of an
expression before the 'else' clause.

This moves the first half of the condition inside of the #ifdef,
which seems to be what the author intended.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Andrew Victor <linux@maxim.org.za>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>

parent c85fc989

arch/arm/mach-at91/at91sam9260_devices.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -1255,12 +1255,8 @@ void __init at91_add_device_cf(struct at91_cf_data *data)
		at91_set_A_periph(AT91_PIN_PC10, 0); /* CFRNW */
		at91_set_A_periph(AT91_PIN_PC15, 1); /* NWAIT */

		if (data->flags & AT91_CF_TRUE_IDE)
		#if defined(CONFIG_PATA_AT91) \|\| defined(CONFIG_PATA_AT91_MODULE)
		if (IS_ENABLED(CONFIG_PATA_AT91) && (data->flags & AT91_CF_TRUE_IDE)
		pdev->name = "pata_at91";
		#else
		#warning "board requires AT91_CF_TRUE_IDE: enable pata_at91"
		#endif
		else
		pdev->name = "at91_cf";