From patchwork Mon Dec 22 09:39:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 423328 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id DEA031400A0 for ; Mon, 22 Dec 2014 20:39:11 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 68EFD2890A2; Mon, 22 Dec 2014 10:37:06 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id CB1D52890A2 for ; Mon, 22 Dec 2014 10:36:59 +0100 (CET) X-policyd-weight: using cached result; rate: -7.6 Received: from fudo.makrotopia.org (fudo.makrotopia.org [5.135.190.93]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Mon, 22 Dec 2014 10:36:56 +0100 (CET) Received: from local by fudo.makrotopia.org with esmtpsa (TLSv1.2:AES128-GCM-SHA256:128) (Exim 4.84) (envelope-from ) id 1Y2zRw-0008BZ-Rr; Mon, 22 Dec 2014 10:38:49 +0100 Date: Mon, 22 Dec 2014 10:39:40 +0100 From: Daniel Golle To: openwrt-devel@lists.openwrt.org Message-ID: <20141222093936.GA26748@makrotopia.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Subject: [OpenWrt-Devel] [PATCH] kernel/generic: fix warnings if libata-ledtrig is disabled X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" accidentally #if was used instead of #ifdef, thus gcc warned about CONFIG_ATA_LEDS being undefined... Signed-off-by: Daniel Golle --- target/linux/generic/patches-3.14/834-ledtrig-libata.patch | 10 +++++----- target/linux/generic/patches-3.18/834-ledtrig-libata.patch | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) 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 b015d7a..ec61ed9 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 b015d7a..ec61ed9 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;