From patchwork Mon Sep 22 14:39:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 391983 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id CE9D3140174 for ; Tue, 23 Sep 2014 00:42:06 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754176AbaIVOj5 (ORCPT ); Mon, 22 Sep 2014 10:39:57 -0400 Received: from mail-oa0-f46.google.com ([209.85.219.46]:36321 "EHLO mail-oa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753925AbaIVOjz (ORCPT ); Mon, 22 Sep 2014 10:39:55 -0400 Received: by mail-oa0-f46.google.com with SMTP id m1so3409459oag.19 for ; Mon, 22 Sep 2014 07:39:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=axQvhd/hQMNVIKreKKJEB+6mI/TTLEmn7s3tPDhx7sQ=; b=0zTg7VuJ4SMPlGcJeqnPV6KxJujjZpeYyPOsfS4nrr5e8U7TAJxbXRBT0c97D0WwtN jxoAPL8qi4JFkl4l+2hIW93B/XvJ+t9NhfSDY3FnQ+ieUgpb5iAUyRAQUfKrsSuVt5Zk TuJ9eeHhwhiyqrDOUylxnTUdfA3b9RF2C4q9k/ORLoAZl+ENsB/dQW2ygaoSMAW6zXhy WvGCfIZO1yFMKNMzwurS6Y9Fzi1AZSHlBqlH6+ZjlizjBi4ni2orfwILjnscEdy2uonF AzlWeE9O+elrHWJFLSjC4rH8THJTJEmWWMez0KlVd/HgPTYLTXzezR/A5wQF2CxxKn5B ydPw== X-Received: by 10.60.179.200 with SMTP id di8mr3089714oec.75.1411396794453; Mon, 22 Sep 2014 07:39:54 -0700 (PDT) Received: from linux.site (cpe-69-76-245-152.kc.res.rr.com. [69.76.245.152]) by mx.google.com with ESMTPSA id ik6sm6243934obb.7.2014.09.22.07.39.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Sep 2014 07:39:54 -0700 (PDT) From: Larry Finger To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, troy_tan@realsil.com.cn, Larry Finger , netdev@vger.kernel.org Subject: [PATCH 01/11 NEXT] rtlwifi: btcoexist: Fix Smatch warning Date: Mon, 22 Sep 2014 09:39:17 -0500 Message-Id: <1411396767-20611-2-git-send-email-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1411396767-20611-1-git-send-email-Larry.Finger@lwfinger.net> References: <1411396767-20611-1-git-send-email-Larry.Finger@lwfinger.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The capability for 802.11ac will soon be added to these drivers. Once that is done, a bitmask will be too large for the data storage. Signed-off-by: Larry Finger --- drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c | 2 +- drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h | 2 +- drivers/net/wireless/rtlwifi/wifi.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c index fcf7459..b2791c8 100644 --- a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c +++ b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c @@ -505,7 +505,7 @@ static void halbtc_write_1byte(void *bt_context, u32 reg_addr, u32 data) } static void halbtc_bitmask_write_1byte(void *bt_context, u32 reg_addr, - u8 bit_mask, u8 data) + u32 bit_mask, u8 data) { struct btc_coexist *btcoexist = (struct btc_coexist *)bt_context; struct rtl_priv *rtlpriv = btcoexist->adapter; diff --git a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h index 1345545..0a903ea 100644 --- a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h +++ b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h @@ -359,7 +359,7 @@ typedef u32 (*bfp_btc_r4)(void *btc_context, u32 reg_addr); typedef void (*bfp_btc_w1)(void *btc_context, u32 reg_addr, u32 data); typedef void (*bfp_btc_w1_bit_mak)(void *btc_context, u32 reg_addr, - u8 bit_mask, u8 data1b); + u32 bit_mask, u8 data1b); typedef void (*bfp_btc_w2)(void *btc_context, u32 reg_addr, u16 data); diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h index 541b077..a943a24 100644 --- a/drivers/net/wireless/rtlwifi/wifi.h +++ b/drivers/net/wireless/rtlwifi/wifi.h @@ -1267,7 +1267,7 @@ struct rtl_mac { u8 sgi_40; u8 sgi_20; u8 bw_40; - u8 mode; /* wireless mode */ + u16 mode; /* wireless mode */ u8 slot_time; u8 short_preamble; u8 use_cts_protect;