From patchwork Thu Sep 26 09:29:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Markowski X-Patchwork-Id: 2947271 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C5A8EBFF05 for ; Thu, 26 Sep 2013 09:30:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 72FF520333 for ; Thu, 26 Sep 2013 09:30:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 425562031A for ; Thu, 26 Sep 2013 09:30:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756239Ab3IZJaM (ORCPT ); Thu, 26 Sep 2013 05:30:12 -0400 Received: from ebb05.tieto.com ([131.207.168.36]:63675 "EHLO ebb05.tieto.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756228Ab3IZJaK (ORCPT ); Thu, 26 Sep 2013 05:30:10 -0400 X-AuditID: 83cfa824-b7f348e000004c45-7c-5243fe9ae693 Received: from FIVLA-EXHUB02.eu.tieto.com ( [131.207.136.42]) by ebb05.tieto.com (SMTP Mailer) with SMTP id 30.71.19525.A9EF3425; Thu, 26 Sep 2013 12:30:02 +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 12:29:59 +0300 From: Bartosz Markowski To: CC: , Bartosz Markowski Subject: [PATCH v2 06/13] ath10k: drop the fw versioning sanity check Date: Thu, 26 Sep 2013 11:29:45 +0200 Message-ID: <1380187792-25626-7-git-send-email-bartosz.markowski@tieto.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1380187792-25626-1-git-send-email-bartosz.markowski@tieto.com> References: <1380187792-25626-1-git-send-email-bartosz.markowski@tieto.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrJIsWRmVeSWpSXmKPExsXSfL5DS3fWP+cgg5VTFS0eXTrGbPFk8ncW izcr7rA7MHt8nnmXzWPzknqPz5vkApijuGxSUnMyy1KL9O0SuDIaX/YxFawQqZjd28nawNgv 2MXIySEhYCIxee4FVghbTOLCvfVsXYxcHEICqxglNn3dzAjhLGOU2PhxChNIFZuAqcT9DSvA OkQEFCR+TfrIBmIzC4RLvNr6iwXEFhZwlbi2+hkziM0ioCpxue8pkM3BwSvgLXHjKzfEMnmJ p/f7wFo5BXwkTu8/wwhiCwGVTPh4AGwMr4CgxMmZT1ggxktIHHzxghmiRkNizs6XLBMYBWYh KZuFpGwBI9MqRv7UpCQDU72SzNSSfL3k/NxNjOAQXKGyg/HsA6lDjAIcjEo8vDvfOQUJsSaW FVfmHmKU5GBSEuXV/uscJMSXlJ9SmZFYnBFfVJqTWnyIUYKDWUmEd91HoBxvSmJlVWpRPkxK moNFSZx3Y4djkJBAemJJanZqakFqEUxWhoNDSYJ35x+gRsGi1PTUirTMnBKENBMHJ8hwHqDh AiCLeYsLEnOLM9Mh8qcYFaXEeXtAmgVAEhmleXC9sBTxilEc6BVh3l6Qdh5geoHrfgU0mAlo sEOHE8jgkkSElFQDI6+Da+S8uf3swgkLc556l858OIvrisJ6trKgW9vur+H4KSPKbrGQ9fky hZWWtSsjYrsiVs+dL1etGpi20XrjvWtLlkn/qBLZIFLZ+4WnxHFz7d2k04/sVQK+srI8Ku/0 OTdxK1e5jjubU43spkAt4cPlTc5ckQ1NX/ImfX13O4Xv6hWu3fERSizFGYmGWsxFxYkAd4x5 ZuwCAAA= 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