From patchwork Sun Jan 18 05:10:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Green X-Patchwork-Id: 5652851 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 A3D209F333 for ; Sun, 18 Jan 2015 05:10:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BC6472037E for ; Sun, 18 Jan 2015 05:10:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E0D3C20381 for ; Sun, 18 Jan 2015 05:10:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751466AbbARFKv (ORCPT ); Sun, 18 Jan 2015 00:10:51 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:50117 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751197AbbARFKt (ORCPT ); Sun, 18 Jan 2015 00:10:49 -0500 Received: by mail-pa0-f46.google.com with SMTP id lf10so32078231pab.5; Sat, 17 Jan 2015 21:10:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=sender:subject:from:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=DuB1iLz2HH/h3EpHnL2PE42LvGjY87vxBsFxjcqN/OQ=; b=q1zAA6LfpqYo/CF13XZpdcwQrCQzdaqQFZNPLpnfF6VG+AXI4JM3jJV5AGKp1k61On OTxMdkYv1aG/eS19zzhfCw8pQu0LOUs6LYWlGxPrJP+pgYtjFKaZ8Pekj1w3HM60dQy/ 4SdxoNVTHOSYG95joWviufxD//YE6cM46cqT3XVRpdPX2mkvTjqVsV/dQoFM92/yzjd5 xruoP0cqbzwPEW8+UxpbFJCJZCwPcQQ53OLjKD+m2Ccy4pWKQqR3ZVDCvhChDiua58r8 NEPVxSS82Sp5oYZA98txZx+3pvUkx3mDA1fRaP/4s7LASFy/i3jyePIJ9YApMxY9WPtQ 3tCQ== X-Received: by 10.70.33.177 with SMTP id s17mr34988431pdi.9.1421557849280; Sat, 17 Jan 2015 21:10:49 -0800 (PST) Received: from warmcat.com (114-36-241-182.dynamic.hinet.net. [114.36.241.182]) by mx.google.com with ESMTPSA id gi6sm8017246pbd.93.2015.01.17.21.10.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Jan 2015 21:10:48 -0800 (PST) Subject: [PATCH 1/7] net: wireless: wcn36xx: add wcn3620 chip type definition From: Andy Green To: Kalle Valo , Eugene Krasnikov Cc: wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org Date: Sun, 18 Jan 2015 13:10:43 +0800 Message-ID: <20150118051043.31866.53087.stgit@114-36-241-182.dynamic.hinet.net> In-Reply-To: <20150118050741.31866.36490.stgit@114-36-241-182.dynamic.hinet.net> References: <20150118050741.31866.36490.stgit@114-36-241-182.dynamic.hinet.net> User-Agent: StGit/0.17-dirty MIME-Version: 1.0 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_SIGNED, 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 Convert the list of chip types to an enum, add the default UNKNOWN type and a type for WCN3620 chip Signed-off-by: Andy Green --- drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h index f0fb81d..a5366b6 100644 --- a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h +++ b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h @@ -93,6 +93,13 @@ struct nv_data { u8 table; }; +enum wcn36xx_chip_type { + WCN36XX_CHIP_UNKNOWN, + WCN36XX_CHIP_3660, + WCN36XX_CHIP_3680, + WCN36XX_CHIP_3620, +}; + /* Interface for platform control path * * @open: hook must be called when wcn36xx wants to open control channel. @@ -179,7 +186,7 @@ struct wcn36xx { u8 fw_minor; u8 fw_major; u32 fw_feat_caps[WCN36XX_HAL_CAPS_SIZE]; - u32 chip_version; + enum wcn36xx_chip_type chip_version; /* extra byte for the NULL termination */ u8 crm_version[WCN36XX_HAL_VERSION_LENGTH + 1]; @@ -227,9 +234,6 @@ struct wcn36xx { }; -#define WCN36XX_CHIP_3660 0 -#define WCN36XX_CHIP_3680 1 - static inline bool wcn36xx_is_fw_version(struct wcn36xx *wcn, u8 major, u8 minor,