From patchwork Thu Sep 26 15:47:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Markowski X-Patchwork-Id: 2949391 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 05B309F289 for ; Thu, 26 Sep 2013 15:48:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6F2812028D for ; Thu, 26 Sep 2013 15:48:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 112B62025B for ; Thu, 26 Sep 2013 15:48:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753363Ab3IZPry (ORCPT ); Thu, 26 Sep 2013 11:47:54 -0400 Received: from ebb06.tieto.com ([131.207.168.38]:44680 "EHLO ebb06.tieto.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752961Ab3IZPrg (ORCPT ); Thu, 26 Sep 2013 11:47:36 -0400 X-AuditID: 83cfa826-b7f408e000003a47-9c-5244571482b3 Received: from FIVLA-EXHUB02.eu.tieto.com ( [131.207.136.42]) by ebb06.tieto.com (SMTP Mailer) with SMTP id F9.ED.14919.41754425; Thu, 26 Sep 2013 18:47:32 +0300 (EEST) Received: from uw000975.eu.tieto.com (10.28.19.100) by inbound.tieto.com (131.207.136.49) with Microsoft SMTP Server id 8.3.298.1; Thu, 26 Sep 2013 18:47:32 +0300 From: Bartosz Markowski To: CC: , Bartosz Markowski Subject: [PATCH v3 06/13] ath10k: drop the fw versioning sanity check Date: Thu, 26 Sep 2013 17:47:10 +0200 Message-ID: <1380210437-4391-7-git-send-email-bartosz.markowski@tieto.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1380210437-4391-1-git-send-email-bartosz.markowski@tieto.com> References: <1380210437-4391-1-git-send-email-bartosz.markowski@tieto.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrBIsWRmVeSWpSXmKPExsXSfL5DS1ck3CXI4NVWHYtHl44xWzyZ/J3F 4s2KO+wOzB6fZ95l89i8pN7j8ya5AOYoLpuU1JzMstQifbsErozGl31MBStEKmb3drI2MPYL djFyckgImEgc2XyVGcIWk7hwbz1bFyMXh5DAKkaJ99fOgyWEBJYxSpyfnQNiswmYStzfsIIV xBYRUJD4NekjG4jNLBAu8WrrLxYQW1jAVWLX3aNgcRYBVYmWxUvA4rwCXhKHD85hh1gmL/H0 fh9YDaeAt8SbzjNAuziAdnlJdPR6QpQLSpyc+YQFYryExMEXL6DO0ZCYs/MlywRGgVlIymYh KVvAyLSKkT81KcnATK8kM7UkXy85P3cTIzgAV6jtYHz2QOoQowAHoxIP7853TkFCrIllxZW5 hxglOZiURHkbQl2ChPiS8lMqMxKLM+KLSnNSiw8xSnAwK4nwvgwAyvGmJFZWpRblw6SkOViU xHk3dDgGCQmkJ5akZqemFqQWwWRlODiUJHg7QIYKFqWmp1akZeaUIKSZODhBhvMADU8BqeEt LkjMLc5Mh8ifYlSUEudNAkkIgCQySvPgemEJ4hWjONArwrwZIFU8wOQC1/0KaDAT0GCHDieQ wSWJCCmpBsaguU5/TH4KnxCK1ap5ddzIXd/i5TZWnazk4xYP1f2Mqh6zhjudEbry7uHGJ497 /CbL60dUVX1YVPLD6ceKt5puf5P/c8SW97/gFe1N/NH3NqExOu3uPPO8XU/UZ/++VVTj9q70 5tW9hTWXlrpm5y8uiuQPuVS+Ltdk9sXI176/zHvO3G7VeKfEUpyRaKjFXFScCABXKQCj6wIA AA== Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 It was corrupted and leading to compilation warning core.c: In function 'ath10k_check_fw_version': core.c:79: warning: comparison is always true due to limited range of data type Since we are going to support new FW track in the driver, the sanity check for fw version number would be an overkill then. This is just for information purposes anyway. Reported-by: Geert Uytterhoeven Signed-off-by: Bartosz Markowski --- drivers/net/wireless/ath/ath10k/core.c | 25 ------------------------- drivers/net/wireless/ath/ath10k/hw.h | 6 ------ 2 files changed, 31 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index 76906d5..31860a6 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -59,27 +59,6 @@ static void ath10k_send_suspend_complete(struct ath10k *ar) wake_up(&ar->event_queue); } -static int ath10k_check_fw_version(struct ath10k *ar) -{ - char version[32]; - - if (ar->fw_version_major >= SUPPORTED_FW_MAJOR && - ar->fw_version_minor >= SUPPORTED_FW_MINOR && - ar->fw_version_release >= SUPPORTED_FW_RELEASE && - ar->fw_version_build >= SUPPORTED_FW_BUILD) - return 0; - - snprintf(version, sizeof(version), "%u.%u.%u.%u", - SUPPORTED_FW_MAJOR, SUPPORTED_FW_MINOR, - SUPPORTED_FW_RELEASE, SUPPORTED_FW_BUILD); - - ath10k_warn("WARNING: Firmware version %s is not officially supported.\n", - ar->hw->wiphy->fw_version); - ath10k_warn("Please upgrade to version %s (or newer)\n", version); - - return 0; -} - static int ath10k_init_connect_htc(struct ath10k *ar) { int status; @@ -616,10 +595,6 @@ int ath10k_core_start(struct ath10k *ar) ath10k_info("firmware %s booted\n", ar->hw->wiphy->fw_version); - status = ath10k_check_fw_version(ar); - if (status) - goto err_disconnect_htc; - status = ath10k_wmi_cmd_init(ar); if (status) { ath10k_err("could not send WMI init command (%d)\n", status); diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h index 8c1be768..66e721a 100644 --- a/drivers/net/wireless/ath/ath10k/hw.h +++ b/drivers/net/wireless/ath/ath10k/hw.h @@ -20,12 +20,6 @@ #include "targaddrs.h" -/* Supported FW version */ -#define SUPPORTED_FW_MAJOR 1 -#define SUPPORTED_FW_MINOR 0 -#define SUPPORTED_FW_RELEASE 0 -#define SUPPORTED_FW_BUILD 636 - /* QCA988X 1.0 definitions (unsupported) */ #define QCA988X_HW_1_0_CHIP_ID_REV 0x0