From patchwork Mon Jun 13 13:29:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 634645 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 3rStvL5ly1z9t10 for ; Mon, 13 Jun 2016 23:30:38 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b=tNwYImnT; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965540AbcFMNaS (ORCPT ); Mon, 13 Jun 2016 09:30:18 -0400 Received: from mail-wm0-f54.google.com ([74.125.82.54]:33716 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965511AbcFMNaP (ORCPT ); Mon, 13 Jun 2016 09:30:15 -0400 Received: by mail-wm0-f54.google.com with SMTP id r190so15631318wmr.0 for ; Mon, 13 Jun 2016 06:30:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uCYM2LfkNJqWipCkRicrAMiTAPfBqHAw3a4AiQMt760=; b=tNwYImnTb7MIqSFkJiqN2K7EK7Z1kzb7ZQkNBt4gf7osB6YQ3e1Cbid50awSHzj/TH zfd0rK2ZvqngnNkTI6uWa2tHwmaQxZUcLLh3tdGchHipfX4kSIOHoa8sHVMzPeXHFBFu N8PlKcncYD09xilQ8E3nT5+CqvXGTeP6bLlykRLDb+qr2p9M/HXSdnojQXPjGtfwySc4 39r/+9MrOlyUHcjNqYerbU+JX45CxTaGda+B+ydvcYynvE3X6vkFjELkzpY2V1fxz8sA 130O3avLuwcJ+2Go3lEOMrI9js4Z6TyvA30iIreIKH3s2cuhHfGEEf+8KNqr+DJjvJ7J kBxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uCYM2LfkNJqWipCkRicrAMiTAPfBqHAw3a4AiQMt760=; b=DZOARSBeiy0wHWbAZY1CNV/k7ZOhJl5hTDL+Tv2KoBKoTgWfRIEOCs5cmI537cCgvx zRzmvY4UNY7n26EEfnTPC23N0OS3J2OBt9HE2/KZWV9WnjDO1uoScq0N+AbiTbpXpYrq /jiQMS9CHP9bzvy/RVRPCkh2sRoC2SweI07o4XaZmjSzgB/Upjm26Frx+4sSP4TbRfW1 nP6tMvzzjT2ag7Z8P0wwg+6bLVWCWGrsQ6EIjC6Ho08KGgX2m+C30onjhoT5LmVJNaXZ 4xqUyoo1YuHtp5cMWI4JIlGYkQOMzXvKRvSzIuay//xz2ld1J+0qx9AktIO0/nNE7Jkv 2jhA== X-Gm-Message-State: ALyK8tJM2/E+vFYx/cbGnZqx40SrTn9YKLMvNSYHJtdU1mT/c5Tmy58NlVdopRmw5dRG+99L X-Received: by 10.194.104.102 with SMTP id gd6mr1190043wjb.170.1465824613635; Mon, 13 Jun 2016 06:30:13 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com (host-79-78-33-110.static.as9105.net. [79.78.33.110]) by smtp.gmail.com with ESMTPSA id m5sm14419678wmm.10.2016.06.13.06.30.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Jun 2016 06:30:13 -0700 (PDT) From: Jakub Kicinski To: netdev@vger.kernel.org Cc: hannes@stressinduktion.org, nbd@nbd.name, linux-kernel@vger.kernel.org, kvalo@codeaurora.org, Jakub Kicinski Subject: [PATCH 2/2] mt7601u: use linux/bitfield.h Date: Mon, 13 Jun 2016 14:29:54 +0100 Message-Id: <1465824594-29662-3-git-send-email-jakub.kicinski@netronome.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465824594-29662-1-git-send-email-jakub.kicinski@netronome.com> References: <1465824594-29662-1-git-send-email-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use the newly added linux/bitfield.h. Signed-off-by: Jakub Kicinski --- drivers/net/wireless/mediatek/mt7601u/dma.h | 2 - drivers/net/wireless/mediatek/mt7601u/mt7601u.h | 5 +- drivers/net/wireless/mediatek/mt7601u/util.h | 77 ------------------------- 3 files changed, 4 insertions(+), 80 deletions(-) delete mode 100644 drivers/net/wireless/mediatek/mt7601u/util.h diff --git a/drivers/net/wireless/mediatek/mt7601u/dma.h b/drivers/net/wireless/mediatek/mt7601u/dma.h index 978e8a90b87f..166ac71905d2 100644 --- a/drivers/net/wireless/mediatek/mt7601u/dma.h +++ b/drivers/net/wireless/mediatek/mt7601u/dma.h @@ -18,8 +18,6 @@ #include #include -#include "util.h" - #define MT_DMA_HDR_LEN 4 #define MT_RX_INFO_LEN 4 #define MT_FCE_INFO_LEN 4 diff --git a/drivers/net/wireless/mediatek/mt7601u/mt7601u.h b/drivers/net/wireless/mediatek/mt7601u/mt7601u.h index 428bd2f10b7b..5ef62e02ce66 100644 --- a/drivers/net/wireless/mediatek/mt7601u/mt7601u.h +++ b/drivers/net/wireless/mediatek/mt7601u/mt7601u.h @@ -15,6 +15,7 @@ #ifndef MT7601U_H #define MT7601U_H +#include #include #include #include @@ -24,7 +25,6 @@ #include #include "regs.h" -#include "util.h" #define MT_CALIBRATE_INTERVAL (4 * HZ) @@ -282,6 +282,9 @@ struct mt7601u_rxwi; extern const struct ieee80211_ops mt7601u_ops; +#define MT76_SET FIELD_PUT +#define MT76_GET FIELD_GET + void mt7601u_init_debugfs(struct mt7601u_dev *dev); u32 mt7601u_rr(struct mt7601u_dev *dev, u32 offset); diff --git a/drivers/net/wireless/mediatek/mt7601u/util.h b/drivers/net/wireless/mediatek/mt7601u/util.h deleted file mode 100644 index b89140bf1210..000000000000 --- a/drivers/net/wireless/mediatek/mt7601u/util.h +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (C) 2014 Felix Fietkau - * Copyright (C) 2004 - 2009 Ivo van Doorn - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 - * as published by the Free Software Foundation - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef __MT76_UTIL_H -#define __MT76_UTIL_H - -/* - * Power of two check, this will check - * if the mask that has been given contains and contiguous set of bits. - * Note that we cannot use the is_power_of_2() function since this - * check must be done at compile-time. - */ -#define is_power_of_two(x) ( !((x) & ((x)-1)) ) -#define low_bit_mask(x) ( ((x)-1) & ~(x) ) -#define is_valid_mask(x) is_power_of_two(1LU + (x) + low_bit_mask(x)) - -/* - * Macros to find first set bit in a variable. - * These macros behave the same as the __ffs() functions but - * the most important difference that this is done during - * compile-time rather then run-time. - */ -#define compile_ffs2(__x) \ - __builtin_choose_expr(((__x) & 0x1), 0, 1) - -#define compile_ffs4(__x) \ - __builtin_choose_expr(((__x) & 0x3), \ - (compile_ffs2((__x))), \ - (compile_ffs2((__x) >> 2) + 2)) - -#define compile_ffs8(__x) \ - __builtin_choose_expr(((__x) & 0xf), \ - (compile_ffs4((__x))), \ - (compile_ffs4((__x) >> 4) + 4)) - -#define compile_ffs16(__x) \ - __builtin_choose_expr(((__x) & 0xff), \ - (compile_ffs8((__x))), \ - (compile_ffs8((__x) >> 8) + 8)) - -#define compile_ffs32(__x) \ - __builtin_choose_expr(((__x) & 0xffff), \ - (compile_ffs16((__x))), \ - (compile_ffs16((__x) >> 16) + 16)) - -/* - * This macro will check the requirements for the FIELD{8,16,32} macros - * The mask should be a constant non-zero contiguous set of bits which - * does not exceed the given typelimit. - */ -#define FIELD_CHECK(__mask) \ - BUILD_BUG_ON(!(__mask) || !is_valid_mask(__mask)) - -#define MT76_SET(_mask, _val) \ - ({ \ - FIELD_CHECK(_mask); \ - (((u32) (_val)) << compile_ffs32(_mask)) & _mask; \ - }) - -#define MT76_GET(_mask, _val) \ - ({ \ - FIELD_CHECK(_mask); \ - (u32) (((_val) & _mask) >> compile_ffs32(_mask)); \ - }) - -#endif