From patchwork Wed Sep 25 09:38:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Markowski X-Patchwork-Id: 2941171 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 187799F288 for ; Wed, 25 Sep 2013 09:38:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 13B3C20583 for ; Wed, 25 Sep 2013 09:38:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D22422057D for ; Wed, 25 Sep 2013 09:38:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754953Ab3IYJiq (ORCPT ); Wed, 25 Sep 2013 05:38:46 -0400 Received: from ebb06.tieto.com ([131.207.168.38]:53485 "EHLO ebb06.tieto.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754847Ab3IYJia (ORCPT ); Wed, 25 Sep 2013 05:38:30 -0400 X-AuditID: 83cfa826-b7f408e000003a47-19-5242af12bcfe Received: from FIVLA-EXHUB02.eu.tieto.com ( [131.207.136.42]) by ebb06.tieto.com (SMTP Mailer) with SMTP id DE.82.14919.21FA2425; Wed, 25 Sep 2013 12:38:26 +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; Wed, 25 Sep 2013 12:38:25 +0300 From: Bartosz Markowski To: CC: , Bartosz Markowski Subject: [PATCH 06/13] ath10k: drop the fw versioning sanity check Date: Wed, 25 Sep 2013 11:38:04 +0200 Message-ID: <1380101891-18312-7-git-send-email-bartosz.markowski@tieto.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1380101891-18312-1-git-send-email-bartosz.markowski@tieto.com> References: <1380101891-18312-1-git-send-email-bartosz.markowski@tieto.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrFIsWRmVeSWpSXmKPExsXSfL5DS1dovVOQwa5nAhaPLh1jtngy+TuL xZsVd9gdmD0+z7zL5rF5Sb3H501yAcxRXDYpqTmZZalF+nYJXBmrL69gLFguUvHibi9bA2Of YBcjJ4eEgInEh/WfmCFsMYkL99azdTFycQgJrGKUuLzsIiOEs4xRon3BanaQKjYBU4n7G1aw gtgiAgoSvyZ9ZAOxmQXCJV5t/cUCYgsLOEl8vX2LEcRmEVCV+Hh8Alg9r4C3xOp1vVDb5CWe 3u8D6+UU8JE4uu812HwhoJqm6deh6gUlTs58wgIxX0Li4IsXzBA1GhJzdr5kmcAoMAtJ2Swk ZQsYmVYx8qcmJRmY6ZVkppbk6yXn525iBAfhCrUdjM8eSB1iFOBgVOLhfbHQMUiINbGsuDL3 EKMkB5OSKO+dtU5BQnxJ+SmVGYnFGfFFpTmpxYcYJTiYlUR4wxcD5XhTEiurUovyYVLSHCxK 4rwbOoAmCaQnlqRmp6YWpBbBZGU4OJQkeFeDDBUsSk1PrUjLzClBSDNxcIIM5wEa/gGkhre4 IDG3ODMdIn+KUVFKnHcTSEIAJJFRmgfXC0sSrxjFgV4R5j0JUsUDTDBw3a+ABjMBDXboABtc koiQkmpgbHzFdSv1cP+C/I3xC3mmit7NaPq6dVcv95671+V2sP2P/i1+reJojKXg245LkdHZ a46FB+yXWCDmZ2Ldm2S67bQX9zVLQ2Ym6QXRZrM+dV49q+KgeES6ZNes2QW3S419fu6R6hF3 nmp1cNG5p5e+hYl8DJr4mV26R31RfGDs/ouLMi4d2sSdosRSnJFoqMVcVJwIAKTix5ntAgAA Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-8.9 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 643f0c9..1b3cf01 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