Author: nbd Date: 2014-12-27 14:02:58 +0100 (Sat, 27 Dec 2014) New Revision: 43786
Modified: trunk/target/linux/generic/patches-3.14/834-ledtrig-libata.patch trunk/target/linux/generic/patches-3.18/834-ledtrig-libata.patch Log: 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 <[email protected]> Modified: trunk/target/linux/generic/patches-3.14/834-ledtrig-libata.patch =================================================================== --- trunk/target/linux/generic/patches-3.14/834-ledtrig-libata.patch 2014-12-27 13:00:09 UTC (rev 43785) +++ trunk/target/linux/generic/patches-3.14/834-ledtrig-libata.patch 2014-12-27 13:02:58 UTC (rev 43786) @@ -57,7 +57,7 @@ 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 @@ break; } } -+#if CONFIG_ATA_LEDS ++#ifdef CONFIG_ATA_LEDS + ata_led_act(ap); +#endif @@ -87,7 +87,7 @@ 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 @@ 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 @@ 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; Modified: trunk/target/linux/generic/patches-3.18/834-ledtrig-libata.patch =================================================================== --- trunk/target/linux/generic/patches-3.18/834-ledtrig-libata.patch 2014-12-27 13:00:09 UTC (rev 43785) +++ trunk/target/linux/generic/patches-3.18/834-ledtrig-libata.patch 2014-12-27 13:02:58 UTC (rev 43786) @@ -57,7 +57,7 @@ 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 @@ break; } } -+#if CONFIG_ATA_LEDS ++#ifdef CONFIG_ATA_LEDS + ata_led_act(ap); +#endif @@ -87,7 +87,7 @@ 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 @@ 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 @@ 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; _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
