From patchwork Mon Jun 1 18:56:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Kholmanskikh X-Patchwork-Id: 6524041 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A3CC99F40A for ; Mon, 1 Jun 2015 18:56:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A1C0F20501 for ; Mon, 1 Jun 2015 18:56:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A906F204DF for ; Mon, 1 Jun 2015 18:56:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751798AbbFAS4g (ORCPT ); Mon, 1 Jun 2015 14:56:36 -0400 Received: from mail-lb0-f173.google.com ([209.85.217.173]:35265 "EHLO mail-lb0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751425AbbFAS4e (ORCPT ); Mon, 1 Jun 2015 14:56:34 -0400 Received: by lbbuc2 with SMTP id uc2so90453416lbb.2; Mon, 01 Jun 2015 11:56:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=VXy0RfH7753FG72Qzbppa10fYDUZoUDNY4FH4uBj0xw=; b=u2SlPySnZGzcNIjKIQWWLh3cMN7UJeomgTTRq2B3gpOAzB1KkOd+DcwZXMM0Ej9sWe 5wEy2aa9ZG7XJShPkDkojDX0Y3fJ/2SBVgaCVqEfYOhX6vkc61Eqgx1fyh/EaaQKE2rO xFYSdUaXJ9Yf5MLKEXen6cfV0BListUIOED2iFFyY2zM5G+8YMOjtmuxLO5Erzo+y6+B LmR6fV52pd7J8+p+m6Hd2cEv84KaHMArWPF+b8ibbAjN1V062501Tjk1cKEGfpqgqFrT bdIAwz2tr1jBkhCkVYoKqlBFA9JdWu0HfG/FUZh7LPHo0TSaevVlTu9NUvLssqbrES2z 2jnA== X-Received: by 10.152.87.204 with SMTP id ba12mr22839626lab.35.1433184992461; Mon, 01 Jun 2015 11:56:32 -0700 (PDT) Received: from localhost.localdomain ([93.92.200.170]) by mx.google.com with ESMTPSA id i1sm1539270lae.45.2015.06.01.11.56.31 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 Jun 2015 11:56:31 -0700 (PDT) From: Stanislav Kholmanskikh To: johnny.kim@atmel.com, rachel.kim@atmel.com, dean.lee@atmel.com, chris.park@atmel.com Cc: gregkh@linuxfoundation.org, devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Stanislav Kholmanskikh Subject: [PATCH v2 1/4] staging: wilc1000: Fix some compile time warnings Date: Mon, 1 Jun 2015 21:56:18 +0300 Message-Id: <1433184981-6077-1-git-send-email-kholmanskikh.s.s@gmail.com> X-Mailer: git-send-email 1.9.1 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 Signed-off-by: Stanislav Kholmanskikh --- Changes since V1: Split the V1 series into more logically unrelated patches and updated patch descriptions accordingly. drivers/staging/wilc1000/wilc_spi.c | 6 +++--- drivers/staging/wilc1000/wilc_wlan.c | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_spi.c b/drivers/staging/wilc1000/wilc_spi.c index 2f38dda..46f28ca 100644 --- a/drivers/staging/wilc1000/wilc_spi.c +++ b/drivers/staging/wilc1000/wilc_spi.c @@ -1194,10 +1194,10 @@ static int spi_init(wilc_wlan_inp_t *inp, wilc_debug_func func) /* Read failed. Try with CRC off. This might happen when module * is removed but chip isn't reset*/ g_spi.crc_off = 1; - PRINT_ER("[wilc spi]: Failed internal read protocol with CRC on, retyring with CRC off...\n", __LINE__); + PRINT_ER("[wilc spi %d]: Failed internal read protocol with CRC on, retyring with CRC off...\n", __LINE__); if (!spi_internal_read(WILC_SPI_PROTOCOL_OFFSET, ®)) { - /* Reaad failed with both CRC on and off, something went bad */ - PRINT_ER("[wilc spi]: Failed internal read protocol...\n", __LINE__); + /* Read failed with both CRC on and off, something went bad */ + PRINT_ER("[wilc spi %d]: Failed internal read protocol...\n", __LINE__); return 0; } } diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index 92ed42a..bdee5e6 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wilc_wlan.c @@ -894,8 +894,6 @@ INLINE void chip_wakeup(void) #endif void chip_sleep_manually(WILC_Uint32 u32SleepTime) { - uint32_t val32; - if (genuChipPSstate != CHIP_WAKEDUP) { /* chip is already sleeping. Do nothing */ return; @@ -2302,7 +2300,7 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup) #else g_wlan.tx_buffer = (uint8_t *)g_wlan.os_func.os_malloc(g_wlan.tx_buffer_size); #endif - PRINT_D(TX_DBG, "g_wlan.tx_buffer = 0x%x\n", g_wlan.tx_buffer); + PRINT_D(TX_DBG, "g_wlan.tx_buffer = 0x%p\n", g_wlan.tx_buffer); if (g_wlan.tx_buffer == WILC_NULL) { /* ENOBUFS 105 */ @@ -2319,7 +2317,7 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup) #else g_wlan.rx_buffer = (uint8_t *)g_wlan.os_func.os_malloc(g_wlan.rx_buffer_size); #endif - PRINT_D(TX_DBG, "g_wlan.rx_buffer =0x%x\n", g_wlan.rx_buffer); + PRINT_D(TX_DBG, "g_wlan.rx_buffer =0x%p\n", g_wlan.rx_buffer); if (g_wlan.rx_buffer == WILC_NULL) { /* ENOBUFS 105 */ ret = -105;