From nobody Fri Jun 19 13:27:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F7C0C433EF for ; Mon, 4 Apr 2022 03:47:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377031AbiDDDtU (ORCPT ); Sun, 3 Apr 2022 23:49:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236018AbiDDDtS (ORCPT ); Sun, 3 Apr 2022 23:49:18 -0400 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6F6335DC3 for ; Sun, 3 Apr 2022 20:47:22 -0700 (PDT) Received: by mail-pj1-x1035.google.com with SMTP id j20-20020a17090ae61400b001ca9553d073so1731266pjy.5 for ; Sun, 03 Apr 2022 20:47:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=YrXH9F1rDhQvv8JRqm7oSpU8bA/raNBsucfvPETPte4=; b=ZOz5Bjo4F69/vp9sV8xJ2y0LRSQ/j2zLzn1f3Euwl2OxyaEIPp4a2nXaqs+gOwe9nb lT38yHD8efA5qJtC1sSogLj+yYnSZkM06NvnYFPsjcLODbDelYDsZxiSho4/tFvDEavH qpVtGMPsHC61oP9288jYnpUQb9PB+XX7GVkPT429WrGP4pMbFXYca3kbw72jRJvLw/5Y rxQPpW/pA5EKCCcr3pRzfzUYenUxrSxqKYwP8HQKZAScxf4nei2MfpWGa2pZk9XLExC9 xjmhEVjHM4Uyfe5RFu6yvsMZTNlYEUkoZUuuE9LhWvjp+1/0ICRl5fc8H3GkF69hUA6V IE/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=YrXH9F1rDhQvv8JRqm7oSpU8bA/raNBsucfvPETPte4=; b=DCrC6j4XF10DSWvD9ApMN8rT4FCPSripgr7/zWgTUtLSm8BmI6nkm95V7E7F0MWL/V o2WsMa1ddxZaXHadU2tY0AfqvnDGoDXk08i+H/8ZLDXxqiruzQ+akqR50VTbUDrSMoYQ M0xcsggB8lmABw77FaEop0obKgRwg2ZmEqQjizWHVFY+IiMJ/xdqkb6JGbUBmtg0jjG4 KVknkvRaugnqDPb/j5T2TmX/ZmT59PF81cEyzGCEhqZWoiZ280pfw3zhluSxYrtnAwgw Q/oL/0+DiARrqSh0CmiK72HdSNu79iYfNlw7IM4gR6c2aPGclGUQVwlbptSuGUVb6+Mz EdYg== X-Gm-Message-State: AOAM530K3j+xDmmhhBrpofMhIRB3aWWGL9HoTSc7AbVuR9vSnrzXxqYE j4AiiiLvm+JMrPgl902P3lE= X-Google-Smtp-Source: ABdhPJyaNaTzSxVSBY3nhvZqZg5mkt9RERopcOPR05/X4I1kfZUmBpSOe/lSpy7eXE7YQeeJ0x3aEQ== X-Received: by 2002:a17:902:b705:b0:154:a806:5325 with SMTP id d5-20020a170902b70500b00154a8065325mr56956659pls.30.1649044042137; Sun, 03 Apr 2022 20:47:22 -0700 (PDT) Received: from ubuntu-vm.jnpr.net ([116.197.184.15]) by smtp.gmail.com with ESMTPSA id k137-20020a633d8f000000b0039800918b00sm8744546pga.77.2022.04.03.20.47.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Apr 2022 20:47:21 -0700 (PDT) From: Sathish Kumar To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Larry.Finger@lwfinger.net, florian.c.schilhabel@googlemail.com Cc: Sathish Kumar Subject: [PATCH v2] staging: rtl8712: Fix multiple blank lines warning from .h files Date: Mon, 4 Apr 2022 09:17:06 +0530 Message-Id: <20220404034706.2384-1-skumark1902@gmail.com> X-Mailer: git-send-email 2.17.1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This patch fixes the checkpatch.pl warnings like: CHECK: Please don't use multiple blank lines + + from rtl8712_*.h, rtl871x_*.h, sta_info.h, and wifi.h Signed-off-by: Sathish Kumar --- Changes in v2: - Updated the subject and changelog text --- drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h | 1 - drivers/staging/rtl8712/rtl8712_macsetting_bitdef.h | 3 --- drivers/staging/rtl8712/rtl8712_macsetting_regdef.h | 2 -- drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h | 1 - drivers/staging/rtl8712/rtl8712_security_bitdef.h | 1 - drivers/staging/rtl8712/rtl8712_spec.h | 3 --- drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h | 4 ---- drivers/staging/rtl8712/rtl8712_syscfg_regdef.h | 2 -- drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h | 1 - drivers/staging/rtl8712/rtl8712_wmac_bitdef.h | 1 - drivers/staging/rtl8712/rtl871x_cmd.h | 2 -- drivers/staging/rtl8712/rtl871x_ioctl.h | 1 - drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 1 - drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h | 3 --- drivers/staging/rtl8712/sta_info.h | 1 - drivers/staging/rtl8712/wifi.h | 1 - 16 files changed, 28 deletions(-) diff --git a/drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h b/drivers/sta= ging/rtl8712/rtl8712_cmdctrl_bitdef.h index e125c7222ab5..68bdec07f51e 100644 --- a/drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h +++ b/drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h @@ -91,6 +91,5 @@ #define _BCNSPACE_MSK 0x0FFF #define _BCNSPACE_SHT 0 =20 - #endif /* __RTL8712_CMDCTRL_BITDEF_H__*/ =20 diff --git a/drivers/staging/rtl8712/rtl8712_macsetting_bitdef.h b/drivers/= staging/rtl8712/rtl8712_macsetting_bitdef.h index 3d9f40fa8469..46d758d3f3a4 100644 --- a/drivers/staging/rtl8712/rtl8712_macsetting_bitdef.h +++ b/drivers/staging/rtl8712/rtl8712_macsetting_bitdef.h @@ -7,7 +7,6 @@ #ifndef __RTL8712_MACSETTING_BITDEF_H__ #define __RTL8712_MACSETTING_BITDEF_H__ =20 - /*MACID*/ /*BSSID*/ =20 @@ -28,7 +27,5 @@ =20 /*BUILDUSER*/ =20 - - #endif /* __RTL8712_MACSETTING_BITDEF_H__*/ =20 diff --git a/drivers/staging/rtl8712/rtl8712_macsetting_regdef.h b/drivers/= staging/rtl8712/rtl8712_macsetting_regdef.h index e8cb2eee9294..64740d99c252 100644 --- a/drivers/staging/rtl8712/rtl8712_macsetting_regdef.h +++ b/drivers/staging/rtl8712/rtl8712_macsetting_regdef.h @@ -16,7 +16,5 @@ #define BUILDTIME (RTL8712_MACIDSETTING_ + 0x0024) #define BUILDUSER (RTL8712_MACIDSETTING_ + 0x0028) =20 - - #endif /*__RTL8712_MACSETTING_REGDEF_H__*/ =20 diff --git a/drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h b/drivers/st= aging/rtl8712/rtl8712_ratectrl_regdef.h index a3eaee0e1b69..9ed5653f3f7f 100644 --- a/drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h +++ b/drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h @@ -39,6 +39,5 @@ #define MCS_TXAGC7 (RTL8712_RATECTRL_ + 0x67) #define CCK_TXAGC (RTL8712_RATECTRL_ + 0x68) =20 - #endif /*__RTL8712_RATECTRL_REGDEF_H__*/ =20 diff --git a/drivers/staging/rtl8712/rtl8712_security_bitdef.h b/drivers/st= aging/rtl8712/rtl8712_security_bitdef.h index 1c26a7eca64a..44275ef455a0 100644 --- a/drivers/staging/rtl8712/rtl8712_security_bitdef.h +++ b/drivers/staging/rtl8712/rtl8712_security_bitdef.h @@ -30,6 +30,5 @@ #define _RXUSEDK BIT(1) #define _TXUSEDK BIT(0) =20 - #endif /*__RTL8712_SECURITY_BITDEF_H__*/ =20 diff --git a/drivers/staging/rtl8712/rtl8712_spec.h b/drivers/staging/rtl87= 12/rtl8712_spec.h index c0bab4c49ae9..613a410e5714 100644 --- a/drivers/staging/rtl8712/rtl8712_spec.h +++ b/drivers/staging/rtl8712/rtl8712_spec.h @@ -30,7 +30,6 @@ =20 #define RTL8712_IOBASE_FF 0x10300000 /*IOBASE_FIFO 0x1031000~0x103AFFFF*/ =20 - /*IOREG Offset for 8712*/ #define RTL8712_SYSCFG_ RTL8712_IOBASE_IOREG #define RTL8712_CMDCTRL_ (RTL8712_IOBASE_IOREG + 0x40) @@ -47,7 +46,6 @@ #define RTL8712_DEBUGCTRL_ (RTL8712_IOBASE_IOREG + 0x310) #define RTL8712_OFFLOAD_ (RTL8712_IOBASE_IOREG + 0x2D0) =20 - /*FIFO for 8712*/ #define RTL8712_DMA_BCNQ (RTL8712_IOBASE_FF + 0x10000) #define RTL8712_DMA_MGTQ (RTL8712_IOBASE_FF + 0x20000) @@ -60,7 +58,6 @@ #define RTL8712_DMA_H2CCMD (RTL8712_IOBASE_FF + 0x90000) #define RTL8712_DMA_C2HCMD (RTL8712_IOBASE_FF + 0xA0000) =20 - /*------------------------------*/ =20 /*BIT 16 15*/ diff --git a/drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h b/drivers/stag= ing/rtl8712/rtl8712_syscfg_bitdef.h index a328ca9b340c..d92df3fbd2b1 100644 --- a/drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h +++ b/drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h @@ -117,20 +117,17 @@ * Block's Bandgap. */ =20 - /*------------------------------------------------------------------------= --*/ /* SPS1_CTRL bits (Offset 0x18-1E, 56bits)*/ /*------------------------------------------------------------------------= --*/ #define SPS1_SWEN BIT(1) /* Enable vsps18 SW Macro Block.*/ #define SPS1_LDEN BIT(0) /* Enable VSPS12 LDO Macro block.*/ =20 - /*------------------------------------------------------------------------= ----*/ /* LDOA15_CTRL bits (Offset 0x20, 8bits)*/ /*------------------------------------------------------------------------= ----*/ #define LDA15_EN BIT(0) /* Enable LDOA15 Macro Block*/ =20 - /*------------------------------------------------------------------------= ----*/ /* 8192S LDOV12D_CTRL bit (Offset 0x21, 8bits)*/ /*------------------------------------------------------------------------= ----*/ @@ -140,7 +137,6 @@ /*CLK_PS_CTRL*/ #define _CLK_GATE_EN BIT(0) =20 - /* EFUSE_CTRL*/ #define EF_FLAG BIT(31) /* Access Flag, Write:1; * Read:0 diff --git a/drivers/staging/rtl8712/rtl8712_syscfg_regdef.h b/drivers/stag= ing/rtl8712/rtl8712_syscfg_regdef.h index e95eb5832ec4..da5efcdedabe 100644 --- a/drivers/staging/rtl8712/rtl8712_syscfg_regdef.h +++ b/drivers/staging/rtl8712/rtl8712_syscfg_regdef.h @@ -14,7 +14,6 @@ #ifndef __RTL8712_SYSCFG_REGDEF_H__ #define __RTL8712_SYSCFG_REGDEF_H__ =20 - #define SYS_ISO_CTRL (RTL8712_SYSCFG_ + 0x0000) #define SYS_FUNC_EN (RTL8712_SYSCFG_ + 0x0002) #define PMC_FSM (RTL8712_SYSCFG_ + 0x0004) @@ -39,6 +38,5 @@ #define RCLK_MON (RTL8712_SYSCFG_ + 0x003E) #define EFUSE_CLK_CTRL (RTL8712_SYSCFG_ + 0x02F8) =20 - #endif /*__RTL8712_SYSCFG_REGDEF_H__*/ =20 diff --git a/drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h b/drivers/st= aging/rtl8712/rtl8712_timectrl_bitdef.h index 1af5f1dd3c20..d7bc9dd5cecd 100644 --- a/drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h +++ b/drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h @@ -45,6 +45,5 @@ /*BCNERRTH*/ /*MLT*/ =20 - #endif /* __RTL8712_TIMECTRL_BITDEF_H__*/ =20 diff --git a/drivers/staging/rtl8712/rtl8712_wmac_bitdef.h b/drivers/stagin= g/rtl8712/rtl8712_wmac_bitdef.h index d3b45c6cd855..ea164e482347 100644 --- a/drivers/staging/rtl8712/rtl8712_wmac_bitdef.h +++ b/drivers/staging/rtl8712/rtl8712_wmac_bitdef.h @@ -45,6 +45,5 @@ #define _RPT_CNT_MSK 0x000FFFFF #define _RPT_CNT_SHT 0 =20 - #endif /*__RTL8712_WMAC_BITDEF_H__*/ =20 diff --git a/drivers/staging/rtl8712/rtl871x_cmd.h b/drivers/staging/rtl871= 2/rtl871x_cmd.h index 95e9ea5b2d98..c7b43a8cd53f 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.h +++ b/drivers/staging/rtl8712/rtl871x_cmd.h @@ -316,7 +316,6 @@ enum _RT_CHANNEL_DOMAIN { RT_CHANNEL_DOMAIN_MAX, }; =20 - struct SetChannelPlan_param { enum _RT_CHANNEL_DOMAIN ChannelPlan; }; @@ -338,7 +337,6 @@ struct getdatarate_rsp { u8 datarates[NumRates]; }; =20 - /* * Caller Mode: Any * AP: AP can use the info for the contents of beacon frame diff --git a/drivers/staging/rtl8712/rtl871x_ioctl.h b/drivers/staging/rtl8= 712/rtl871x_ioctl.h index 634e67461712..d6332a8c7f4f 100644 --- a/drivers/staging/rtl8712/rtl871x_ioctl.h +++ b/drivers/staging/rtl8712/rtl871x_ioctl.h @@ -13,7 +13,6 @@ #define OID_802_11_PMKID 0x0d010123 #endif =20 - /* For DDK-defined OIDs*/ #define OID_NDIS_SEG1 0x00010100 #define OID_NDIS_SEG2 0x00010200 diff --git a/drivers/staging/rtl8712/rtl871x_mp_ioctl.h b/drivers/staging/r= tl8712/rtl871x_mp_ioctl.h index 98204493a04c..aa4d5ce471f2 100644 --- a/drivers/staging/rtl8712/rtl871x_mp_ioctl.h +++ b/drivers/staging/rtl8712/rtl871x_mp_ioctl.h @@ -148,7 +148,6 @@ extern struct oid_obj_priv oid_rtl_seg_87_12_00[32]; =20 #endif /* _RTL871X_MP_IOCTL_C_ */ =20 - enum MP_MODE { MP_START_MODE, MP_STOP_MODE, diff --git a/drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h b/drivers/stag= ing/rtl8712/rtl871x_mp_phy_regdef.h index ca5072e11e22..a08c5d2f59e3 100644 --- a/drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h +++ b/drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h @@ -26,7 +26,6 @@ #ifndef __RTL871X_MP_PHY_REGDEF_H #define __RTL871X_MP_PHY_REGDEF_H =20 - /*--------------------------Define Parameters-----------------------------= --*/ =20 /*=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D @@ -1008,7 +1007,6 @@ #define ANTENNA_C 0x4 #define ANTENNA_D 0x8 =20 - /* accept all physical address */ #define RCR_AAP BIT(0) #define RCR_APM BIT(1) /* accept physical match */ @@ -1032,6 +1030,5 @@ =20 /*--------------------------Define Parameters-----------------------------= --*/ =20 - #endif /*__INC_HAL8192SPHYREG_H */ =20 diff --git a/drivers/staging/rtl8712/sta_info.h b/drivers/staging/rtl8712/s= ta_info.h index 9b7e5ffa380d..6286c622475e 100644 --- a/drivers/staging/rtl8712/sta_info.h +++ b/drivers/staging/rtl8712/sta_info.h @@ -21,7 +21,6 @@ #define NUM_STA 32 #define NUM_ACL 64 =20 - /* if mode =3D=3D0, then the sta is allowed once the addr is hit. * if mode =3D=3D1, then the sta is rejected once the addr is non-hit. */ diff --git a/drivers/staging/rtl8712/wifi.h b/drivers/staging/rtl8712/wifi.h index b8acb9c7395d..498e6dec7e67 100644 --- a/drivers/staging/rtl8712/wifi.h +++ b/drivers/staging/rtl8712/wifi.h @@ -186,7 +186,6 @@ static inline unsigned char *get_hdr_bssid(unsigned cha= r *pframe) #define _CAPABILITY_ 2 #define _TIMESTAMP_ 8 =20 - /*------------------------------------------------------------------------= ----- * Below is the definition for WMM *------------------------------------------------------------------------= ------ --=20 2.17.1