From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 27 Dec 2014 13:02:58 +0000 (+0000)
Subject: kernel/generic: fix warnings if libata-ledtrig is disabled
X-Git-Tag: reboot~4869
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=604fc8faf546ce85c8c6a5204f4dcbd3e5cef8f5;p=oweals%2Fopenwrt.git

kernel/generic: fix warnings if libata-ledtrig is disabled

accidentally #if was used instead of #ifdef, thus gcc warned
about CONFIG_ATA_LEDS being undefined...

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 43786
---

diff --git a/target/linux/generic/patches-3.14/834-ledtrig-libata.patch b/target/linux/generic/patches-3.14/834-ledtrig-libata.patch
index b015d7a2fb..ec61ed9e31 100644
--- a/target/linux/generic/patches-3.14/834-ledtrig-libata.patch
+++ b/target/linux/generic/patches-3.14/834-ledtrig-libata.patch
@@ -57,7 +57,7 @@ index 5c84fb5..eb49e02 100644
  	return block;
  }
  
-+#if CONFIG_ATA_LEDS
++#ifdef CONFIG_ATA_LEDS
 +#define LIBATA_BLINK_DELAY 20 /* ms */
 +static inline void ata_led_act(struct ata_port *ap)
 +{
@@ -77,7 +77,7 @@ index 5c84fb5..eb49e02 100644
  			break;
  		}
  	}
-+#if CONFIG_ATA_LEDS
++#ifdef CONFIG_ATA_LEDS
 +	ata_led_act(ap);
 +#endif
  
@@ -87,7 +87,7 @@ index 5c84fb5..eb49e02 100644
  	ap->stats.unhandled_irq = 1;
  	ap->stats.idle_irq = 1;
  #endif
-+#if CONFIG_ATA_LEDS
++#ifdef CONFIG_ATA_LEDS
 +	ap->ledtrig = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);
 +#endif
  	ata_sff_port_init(ap);
@@ -97,7 +97,7 @@ index 5c84fb5..eb49e02 100644
  
  		kfree(ap->pmp_link);
  		kfree(ap->slave_link);
-+#if CONFIG_ATA_LEDS
++#ifdef CONFIG_ATA_LEDS
 +		if (ap->ledtrig) {
 +			led_trigger_unregister(ap->ledtrig);
 +			kfree(ap->ledtrig);
@@ -110,7 +110,7 @@ index 5c84fb5..eb49e02 100644
  		host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
  		host->ports[i]->local_port_no = i + 1;
  	}
-+#if CONFIG_ATA_LEDS
++#ifdef CONFIG_ATA_LEDS
 +	for (i = 0; i < host->n_ports; i++) {
 +		if (unlikely(!host->ports[i]->ledtrig))
 +			continue;
diff --git a/target/linux/generic/patches-3.18/834-ledtrig-libata.patch b/target/linux/generic/patches-3.18/834-ledtrig-libata.patch
index b015d7a2fb..ec61ed9e31 100644
--- a/target/linux/generic/patches-3.18/834-ledtrig-libata.patch
+++ b/target/linux/generic/patches-3.18/834-ledtrig-libata.patch
@@ -57,7 +57,7 @@ index 5c84fb5..eb49e02 100644
  	return block;
  }
  
-+#if CONFIG_ATA_LEDS
++#ifdef CONFIG_ATA_LEDS
 +#define LIBATA_BLINK_DELAY 20 /* ms */
 +static inline void ata_led_act(struct ata_port *ap)
 +{
@@ -77,7 +77,7 @@ index 5c84fb5..eb49e02 100644
  			break;
  		}
  	}
-+#if CONFIG_ATA_LEDS
++#ifdef CONFIG_ATA_LEDS
 +	ata_led_act(ap);
 +#endif
  
@@ -87,7 +87,7 @@ index 5c84fb5..eb49e02 100644
  	ap->stats.unhandled_irq = 1;
  	ap->stats.idle_irq = 1;
  #endif
-+#if CONFIG_ATA_LEDS
++#ifdef CONFIG_ATA_LEDS
 +	ap->ledtrig = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);
 +#endif
  	ata_sff_port_init(ap);
@@ -97,7 +97,7 @@ index 5c84fb5..eb49e02 100644
  
  		kfree(ap->pmp_link);
  		kfree(ap->slave_link);
-+#if CONFIG_ATA_LEDS
++#ifdef CONFIG_ATA_LEDS
 +		if (ap->ledtrig) {
 +			led_trigger_unregister(ap->ledtrig);
 +			kfree(ap->ledtrig);
@@ -110,7 +110,7 @@ index 5c84fb5..eb49e02 100644
  		host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
  		host->ports[i]->local_port_no = i + 1;
  	}
-+#if CONFIG_ATA_LEDS
++#ifdef CONFIG_ATA_LEDS
 +	for (i = 0; i < host->n_ports; i++) {
 +		if (unlikely(!host->ports[i]->ledtrig))
 +			continue;