From patchwork Sun Nov 8 21:31:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: punit vara X-Patchwork-Id: 7579511 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 56AB0C05C6 for ; Sun, 8 Nov 2015 21:32:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 62C242051F for ; Sun, 8 Nov 2015 21:32:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 81FA82051A for ; Sun, 8 Nov 2015 21:32:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751277AbbKHVcN (ORCPT ); Sun, 8 Nov 2015 16:32:13 -0500 Received: from mail-wm0-f49.google.com ([74.125.82.49]:37264 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750698AbbKHVcL (ORCPT ); Sun, 8 Nov 2015 16:32:11 -0500 Received: by wmww144 with SMTP id w144so16898875wmw.0; Sun, 08 Nov 2015 13:32:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=z2Z864npBkqQn99jXwjKMUZkakzVjTXr2JHJmU1KUzA=; b=DbXjtbe/STMTwCFj4NKo1ioJhC4kOpSirdcI7FsXmN+oXs0zHoTOeGYymjoznP9+Wk +QrEQBYS/Sci6KnPGy83Mn0r0gjiJR10DL0PIKmFbVCYlil9AvaVoXK4L8H8FYe9iwPQ lWHOduATgeeSh2r9w6fzlafOANXipFAHmpRs7Yh1jLHID+b9wDG7jJvq1f56dKCIrvRg i0HjqpD3y5SkUth/ET2mUW6wb6sBACaykYQNZql/nH3pi0Rwr4slKXMwEYbCE6bjQK6j XjiT/BILn2FKEt7PFdk1ewxNptaHxEqH/Kx0XJWWMQDe7VgDM9p/V63ziCaYecQXU8yb siEQ== X-Received: by 10.28.140.208 with SMTP id o199mr23136498wmd.58.1447018329608; Sun, 08 Nov 2015 13:32:09 -0800 (PST) Received: from localhost.localdomain ([163.47.14.253]) by smtp.gmail.com with ESMTPSA id t126sm10664464wmd.23.2015.11.08.13.32.03 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 08 Nov 2015 13:32:08 -0800 (PST) From: Punit Vara To: gregkh@linuxfoundation.org Cc: johnny.kim@atmel.com, austin.shin@atmel.com, chris.park@atmel.com, tony.cho@atmel.com, glen.lee@atmel.com, leo.kim@atmel.com, linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Punit Vara Subject: [PATCH V2] Staging: wilc1000: Fix build break due to undeclared *wilc and implicit declaration of init_irq Date: Mon, 9 Nov 2015 03:01:50 +0530 Message-Id: <1447018310-4524-1-git-send-email-punitvara@gmail.com> X-Mailer: git-send-email 2.6.2 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch is to the linux_wlan.c file that fixes up break found during make drivers/staging/wilc1000/linux_wlan.o Patch add following things to file : -init_irq declaration -At preprocessor (!defined WILC_SDIO) to defination of init_irq -At preprocessor (!defined WILC_SDIO) to defination isr_uh_routine -removes unnecessary lines to declare *wilc Patch fixes 702c0e50f and 2c1d05d10 tags. Signed-off-by: Punit Vara --- -Fixes tag added suggested by Dan carpenter. -Remove declaration of autovariable with same type and same name suggested by Joe Perches drivers/staging/wilc1000/linux_wlan.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 086f1db..5bd14ed 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -208,7 +208,7 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event return NOTIFY_DONE; } -#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO) +#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO) || (!defined WILC_SDIO) static irqreturn_t isr_uh_routine(int irq, void *user_data) { perInterface_wlan_t *nic; @@ -246,7 +246,7 @@ irqreturn_t isr_bh_routine(int irq, void *userdata) return IRQ_HANDLED; } -#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO) +#if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO) || (!defined WILC_SDIO) static int init_irq(struct net_device *dev) { int ret = 0; @@ -937,6 +937,10 @@ static void wlan_deinitialize_threads(struct net_device *dev) } } +#if (!defined WILC_SDIO) || (defined WILC_SDIO_IRQ_GPIO) +static int init_irq(struct net_device *dev); +#endif + int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic) { wilc_wlan_inp_t nwi; @@ -1578,9 +1582,7 @@ int wilc_netdev_init(struct wilc **wilc) static int __init init_wilc_driver(void) { -#ifdef WILC_SPI struct wilc *wilc; -#endif #if defined(WILC_DEBUGFS) if (wilc_debugfs_init() < 0) {