From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D91BC433EF for ; Sun, 17 Oct 2021 11:56:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E7F2F61054 for ; Sun, 17 Oct 2021 11:56:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245519AbhJQL6z (ORCPT ); Sun, 17 Oct 2021 07:58:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236245AbhJQL6x (ORCPT ); Sun, 17 Oct 2021 07:58:53 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAF12C061765 for ; Sun, 17 Oct 2021 04:56:43 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id g39so2110367wmp.3 for ; Sun, 17 Oct 2021 04:56:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :cc:references:from:in-reply-to:content-transfer-encoding; bh=EtnmrqVsOzfWfRN3hSue7Qa3ZvrSmziGGM17hfZP1YM=; b=NdQAbWSy1+TBAkrTuEmixGF8zw02ZEMnBBeZk55w8iKxn3E/88gkKrXZrKDUt8M1tP tt9G0yVPUIs7JYs6bnzKDe1m/cD48u3xIELoKdPfj19geNG4SRj3AC1KqbJlA7JlVFQ3 8hQ/TfspTfHWUeezVDTI3nUitqigSAw7nlV4MvMNh0ybNzUaTTi6pxtG1MD7E9qm1ref cL2+JJNx46eGaCD6TONpN1G8WQNZULuNLuXy4PiajWMeKfvEcxRhn5s1VuX+P00/a9aq PvoBHkjcK8x/iNIn9ASCcHciya3D4U7+/59/pXD5TKPFPV6QeI6AmiDRR3SS1l3FraBr gIsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=EtnmrqVsOzfWfRN3hSue7Qa3ZvrSmziGGM17hfZP1YM=; b=es59JZn1Quj1HyJw1HhOxSPuT77XJykK3wszlOfIgS6kwLKr349laasu6x9Q3Ukrqa rCyA9qyPW2mSnjZVUDtZZCvacI6rNLavOX9NNMCdKPzGs33ouMISuYU70UgkPCJBxcc6 kk6cbZFoJOeomVE+7ofXwe2kcW5Utsb45eePOKHZ64ym22r8TJuCphvBxGQbofk8QLB8 o0Y2PSkhHY0uTxdeR72B128Q8t5jklacke3tBwTzFpLoKFvi2EJGR6UzmbTIBcThimNE qX1r5eFsQR3TPjVfLxnu6uzvsShQZiP9I8SZ2zL8ra4BWTpkBmASPHuBdEBVT+edm3hY KeqQ== X-Gm-Message-State: AOAM530zu5RAKu03gFgjTjlSy2Du4NH74pxYS5B9vVL9XQgA02FIUozT B/bu6WUftqQW1iCRVQbIhfQ= X-Google-Smtp-Source: ABdhPJwpxjStYL5kw7hNsGFHpnaaOlyozKeH/A5nXj0NobW2frEtwUuaqB8IQo+DYmJUTiFk2+0s0g== X-Received: by 2002:a05:600c:4fcd:: with SMTP id o13mr38969833wmq.158.1634471802262; Sun, 17 Oct 2021 04:56:42 -0700 (PDT) Received: from ?IPV6:2a02:8108:96c0:3b88::d7f0? ([2a02:8108:96c0:3b88::d7f0]) by smtp.gmail.com with ESMTPSA id c185sm9832549wma.8.2021.10.17.04.56.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 17 Oct 2021 04:56:41 -0700 (PDT) Message-ID: <1c6c6282-5039-4324-2f8c-9e35d25eaec5@gmail.com> Date: Sun, 17 Oct 2021 13:56:40 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 Subject: Re: [PATCH 7/8] staging: r8188eu: remove procfs functions Content-Language: en-US To: Martin Kaiser , Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org References: <20211016113008.27549-1-martin@kaiser.cx> <20211016113008.27549-8-martin@kaiser.cx> From: Michael Straube In-Reply-To: <20211016113008.27549-8-martin@kaiser.cx> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/16/21 13:30, Martin Kaiser wrote: > It seems that previous versions of this driver provided a procfs > interface for debugging. > > Remove the procfs helper functions which are no longer used. > > Signed-off-by: Martin Kaiser > --- > drivers/staging/r8188eu/Makefile | 1 - > drivers/staging/r8188eu/core/rtw_debug.c | 886 -------------------- > drivers/staging/r8188eu/include/rtw_debug.h | 148 ---- > 3 files changed, 1035 deletions(-) > delete mode 100644 drivers/staging/r8188eu/core/rtw_debug.c > > diff --git a/drivers/staging/r8188eu/Makefile b/drivers/staging/r8188eu/Makefile > index 27826baef377..d63fad20e9d2 100644 > --- a/drivers/staging/r8188eu/Makefile > +++ b/drivers/staging/r8188eu/Makefile > @@ -74,7 +74,6 @@ rtk_core := \ > core/rtw_ap.o \ > core/rtw_br_ext.o \ > core/rtw_cmd.o \ > - core/rtw_debug.o \ > core/rtw_efuse.o \ > core/rtw_ieee80211.o \ > core/rtw_ioctl_set.o \ > diff --git a/drivers/staging/r8188eu/core/rtw_debug.c b/drivers/staging/r8188eu/core/rtw_debug.c > deleted file mode 100644 > index 3d613d997a38..000000000000 > --- a/drivers/staging/r8188eu/core/rtw_debug.c > +++ /dev/null > @@ -1,886 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0 > -/* Copyright(c) 2007 - 2012 Realtek Corporation. */ > - > -#define _RTW_DEBUG_C_ > - > -#include "../include/rtw_debug.h" > -#include "../include/drv_types.h" > - > -int proc_get_drv_version(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - int len = 0; > - > - len += snprintf(page + len, count - len, "%s\n", DRIVERVERSION); > - > - *eof = 1; > - return len; > -} > - > -int proc_get_write_reg(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - *eof = 1; > - return 0; > -} > - > -int proc_set_write_reg(struct file *file, const char __user *buffer, > - unsigned long count, void *data) > -{ > - struct net_device *dev = (struct net_device *)data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - char tmp[32]; > - u32 addr, val, len; > - > - if (count < 3) { > - DBG_88E("argument size is less than 3\n"); > - return -EFAULT; > - } > - > - if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) { > - int num = sscanf(tmp, "%x %x %x", &addr, &val, &len); > - > - if (num != 3) { > - DBG_88E("invalid write_reg parameter!\n"); > - return count; > - } > - switch (len) { > - case 1: > - rtw_write8(padapter, addr, (u8)val); > - break; > - case 2: > - rtw_write16(padapter, addr, (u16)val); > - break; > - case 4: > - rtw_write32(padapter, addr, val); > - break; > - default: > - DBG_88E("error write length =%d", len); > - break; > - } > - } > - return count; > -} > - > -static u32 proc_get_read_addr = 0xeeeeeeee; > -static u32 proc_get_read_len = 0x4; > - > -int proc_get_read_reg(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - > - int len = 0; > - > - if (proc_get_read_addr == 0xeeeeeeee) { > - *eof = 1; > - return len; > - } > - > - switch (proc_get_read_len) { > - case 1: > - len += snprintf(page + len, count - len, "rtw_read8(0x%x)=0x%x\n", proc_get_read_addr, rtw_read8(padapter, proc_get_read_addr)); > - break; > - case 2: > - len += snprintf(page + len, count - len, "rtw_read16(0x%x)=0x%x\n", proc_get_read_addr, rtw_read16(padapter, proc_get_read_addr)); > - break; > - case 4: > - len += snprintf(page + len, count - len, "rtw_read32(0x%x)=0x%x\n", proc_get_read_addr, rtw_read32(padapter, proc_get_read_addr)); > - break; > - default: > - len += snprintf(page + len, count - len, "error read length=%d\n", proc_get_read_len); > - break; > - } > - > - *eof = 1; > - return len; > -} > - > -int proc_set_read_reg(struct file *file, const char __user *buffer, > - unsigned long count, void *data) > -{ > - char tmp[16]; > - u32 addr, len; > - > - if (count < 2) { > - DBG_88E("argument size is less than 2\n"); > - return -EFAULT; > - } > - > - if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) { > - int num = sscanf(tmp, "%x %x", &addr, &len); > - > - if (num != 2) { > - DBG_88E("invalid read_reg parameter!\n"); > - return count; > - } > - > - proc_get_read_addr = addr; > - > - proc_get_read_len = len; > - } > - > - return count; > -} > - > -int proc_get_fwstate(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; > - > - int len = 0; > - > - len += snprintf(page + len, count - len, "fwstate=0x%x\n", get_fwstate(pmlmepriv)); > - > - *eof = 1; > - return len; > -} > - > -int proc_get_sec_info(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - struct security_priv *psecuritypriv = &padapter->securitypriv; > - > - int len = 0; > - > - len += snprintf(page + len, count - len, "auth_alg=0x%x, enc_alg=0x%x, auth_type=0x%x, enc_type=0x%x\n", > - psecuritypriv->dot11AuthAlgrthm, psecuritypriv->dot11PrivacyAlgrthm, > - psecuritypriv->ndisauthtype, psecuritypriv->ndisencryptstatus); > - > - *eof = 1; > - return len; > -} > - > -int proc_get_mlmext_state(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; > - struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; > - > - int len = 0; > - > - len += snprintf(page + len, count - len, "pmlmeinfo->state=0x%x\n", pmlmeinfo->state); > - > - *eof = 1; > - return len; > -} > - > -int proc_get_qos_option(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; > - > - int len = 0; > - > - len += snprintf(page + len, count - len, "qos_option=%d\n", pmlmepriv->qospriv.qos_option); > - > - *eof = 1; > - return len; > -} > - > -int proc_get_ht_option(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; > - > - int len = 0; > - len += snprintf(page + len, count - len, "ht_option=%d\n", pmlmepriv->htpriv.ht_option); > - *eof = 1; > - return len; > -} > - > -int proc_get_rf_info(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; > - int len = 0; > - > - len += snprintf(page + len, count - len, "cur_ch=%d, cur_bw=%d, cur_ch_offet=%d\n", > - pmlmeext->cur_channel, pmlmeext->cur_bwmode, pmlmeext->cur_ch_offset); > - *eof = 1; > - return len; > -} > - > -int proc_get_ap_info(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct sta_info *psta; > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; > - struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; > - struct wlan_network *cur_network = &pmlmepriv->cur_network; > - struct sta_priv *pstapriv = &padapter->stapriv; > - int len = 0; > - > - psta = rtw_get_stainfo(pstapriv, cur_network->network.MacAddress); > - if (psta) { > - int i; > - struct recv_reorder_ctrl *preorder_ctrl; > - > - len += snprintf(page + len, count - len, "SSID=%s\n", cur_network->network.Ssid.Ssid); > - len += snprintf(page + len, count - len, "sta's macaddr:%pM\n", psta->hwaddr); > - len += snprintf(page + len, count - len, "cur_channel=%d, cur_bwmode=%d, cur_ch_offset=%d\n", pmlmeext->cur_channel, pmlmeext->cur_bwmode, pmlmeext->cur_ch_offset); > - len += snprintf(page + len, count - len, "rtsen=%d, cts2slef=%d\n", psta->rtsen, psta->cts2self); > - len += snprintf(page + len, count - len, "state=0x%x, aid=%d, macid=%d, raid=%d\n", psta->state, psta->aid, psta->mac_id, psta->raid); > - len += snprintf(page + len, count - len, "qos_en=%d, ht_en=%d, init_rate=%d\n", psta->qos_option, psta->htpriv.ht_option, psta->init_rate); > - len += snprintf(page + len, count - len, "bwmode=%d, ch_offset=%d, sgi=%d\n", psta->htpriv.bwmode, psta->htpriv.ch_offset, psta->htpriv.sgi); > - len += snprintf(page + len, count - len, "ampdu_enable = %d\n", psta->htpriv.ampdu_enable); > - len += snprintf(page + len, count - len, "agg_enable_bitmap=%x, candidate_tid_bitmap=%x\n", psta->htpriv.agg_enable_bitmap, psta->htpriv.candidate_tid_bitmap); > - > - for (i = 0; i < 16; i++) { > - preorder_ctrl = &psta->recvreorder_ctrl[i]; > - if (preorder_ctrl->enable) > - len += snprintf(page + len, count - len, "tid=%d, indicate_seq=%d\n", i, preorder_ctrl->indicate_seq); > - } > - } else { > - len += snprintf(page + len, count - len, "can't get sta's macaddr, cur_network's macaddr: %pM\n", cur_network->network.MacAddress); > - } > - > - *eof = 1; > - return len; > -} > - > -int proc_get_trx_info(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - struct xmit_priv *pxmitpriv = &padapter->xmitpriv; > - struct recv_priv *precvpriv = &padapter->recvpriv; > - int len = 0; > - > - len += snprintf(page + len, count - len, "free_xmitbuf_cnt=%d, free_xmitframe_cnt=%d, free_ext_xmitbuf_cnt=%d, free_recvframe_cnt=%d\n", > - pxmitpriv->free_xmitbuf_cnt, pxmitpriv->free_xmitframe_cnt, pxmitpriv->free_xmit_extbuf_cnt, precvpriv->free_recvframe_cnt); > - len += snprintf(page + len, count - len, "rx_urb_pending_cn=%d\n", precvpriv->rx_pending_cnt); > - > - *eof = 1; > - return len; > -} > - > -int proc_get_mac_reg_dump1(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - int len = 0; > - int i, j = 1; > - > - len += snprintf(page + len, count - len, "\n======= MAC REG =======\n"); > - > - for (i = 0x0; i < 0x300; i += 4) { > - if (j % 4 == 1) > - len += snprintf(page + len, count - len, "0x%02x", i); > - len += snprintf(page + len, count - len, " 0x%08x ", rtw_read32(padapter, i)); > - if ((j++) % 4 == 0) > - len += snprintf(page + len, count - len, "\n"); > - } > - > - *eof = 1; > - return len; > -} > - > -int proc_get_mac_reg_dump2(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - int len = 0; > - int i, j = 1; > - > - len += snprintf(page + len, count - len, "\n======= MAC REG =======\n"); > - memset(page, 0, count); > - for (i = 0x300; i < 0x600; i += 4) { > - if (j % 4 == 1) > - len += snprintf(page + len, count - len, "0x%02x", i); > - len += snprintf(page + len, count - len, " 0x%08x ", rtw_read32(padapter, i)); > - if ((j++) % 4 == 0) > - len += snprintf(page + len, count - len, "\n"); > - } > - > - *eof = 1; > - return len; > -} > - > -int proc_get_mac_reg_dump3(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - int len = 0; > - int i, j = 1; > - > - len += snprintf(page + len, count - len, "\n======= MAC REG =======\n"); > - > - for (i = 0x600; i < 0x800; i += 4) { > - if (j % 4 == 1) > - len += snprintf(page + len, count - len, "0x%02x", i); > - len += snprintf(page + len, count - len, " 0x%08x ", rtw_read32(padapter, i)); > - if ((j++) % 4 == 0) > - len += snprintf(page + len, count - len, "\n"); > - } > - > - *eof = 1; > - return len; > -} > - > -int proc_get_bb_reg_dump1(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - int len = 0; > - int i, j = 1; > - > - len += snprintf(page + len, count - len, "\n======= BB REG =======\n"); > - for (i = 0x800; i < 0xB00; i += 4) { > - if (j % 4 == 1) > - len += snprintf(page + len, count - len, "0x%02x", i); > - len += snprintf(page + len, count - len, " 0x%08x ", rtw_read32(padapter, i)); > - if ((j++) % 4 == 0) > - len += snprintf(page + len, count - len, "\n"); > - } > - *eof = 1; > - return len; > -} > - > -int proc_get_bb_reg_dump2(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - int len = 0; > - int i, j = 1; > - > - len += snprintf(page + len, count - len, "\n======= BB REG =======\n"); > - for (i = 0xB00; i < 0xE00; i += 4) { > - if (j % 4 == 1) > - len += snprintf(page + len, count - len, "0x%02x", i); > - len += snprintf(page + len, count - len, " 0x%08x ", rtw_read32(padapter, i)); > - if ((j++) % 4 == 0) > - len += snprintf(page + len, count - len, "\n"); > - } > - *eof = 1; > - return len; > -} > - > -int proc_get_bb_reg_dump3(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - int len = 0; > - int i, j = 1; > - > - len += snprintf(page + len, count - len, "\n======= BB REG =======\n"); > - for (i = 0xE00; i < 0x1000; i += 4) { > - if (j % 4 == 1) > - len += snprintf(page + len, count - len, "0x%02x", i); > - len += snprintf(page + len, count - len, " 0x%08x ", rtw_read32(padapter, i)); > - if ((j++) % 4 == 0) > - len += snprintf(page + len, count - len, "\n"); > - } > - *eof = 1; > - return len; > -} > - > -int proc_get_rf_reg_dump1(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - int len = 0; > - int i, j = 1, path; > - u32 value; > - > - len += snprintf(page + len, count - len, "\n======= RF REG =======\n"); > - path = 1; > - len += snprintf(page + len, count - len, "\nRF_Path(%x)\n", path); > - for (i = 0; i < 0xC0; i++) { > - value = rtl8188e_PHY_QueryRFReg(padapter, path, i, 0xffffffff); > - if (j % 4 == 1) > - len += snprintf(page + len, count - len, "0x%02x ", i); > - len += snprintf(page + len, count - len, " 0x%08x ", value); > - if ((j++) % 4 == 0) > - len += snprintf(page + len, count - len, "\n"); > - } > - *eof = 1; > - return len; > -} > - > -int proc_get_rf_reg_dump2(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - int len = 0; > - int i, j = 1, path; > - u32 value; > - > - len += snprintf(page + len, count - len, "\n======= RF REG =======\n"); > - path = 1; > - len += snprintf(page + len, count - len, "\nRF_Path(%x)\n", path); > - for (i = 0xC0; i < 0x100; i++) { > - value = rtl8188e_PHY_QueryRFReg(padapter, path, i, 0xffffffff); > - if (j % 4 == 1) > - len += snprintf(page + len, count - len, "0x%02x ", i); > - len += snprintf(page + len, count - len, " 0x%08x ", value); > - if ((j++) % 4 == 0) > - len += snprintf(page + len, count - len, "\n"); > - } > - *eof = 1; > - return len; > -} > - > -int proc_get_rf_reg_dump3(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - int len = 0; > - int i, j = 1, path; > - u32 value; > - > - len += snprintf(page + len, count - len, "\n======= RF REG =======\n"); > - path = 2; > - len += snprintf(page + len, count - len, "\nRF_Path(%x)\n", path); > - for (i = 0; i < 0xC0; i++) { > - value = rtl8188e_PHY_QueryRFReg(padapter, path, i, 0xffffffff); > - if (j % 4 == 1) > - len += snprintf(page + len, count - len, "0x%02x ", i); > - len += snprintf(page + len, count - len, " 0x%08x ", value); > - if ((j++) % 4 == 0) > - len += snprintf(page + len, count - len, "\n"); > - } > - > - *eof = 1; > - return len; > -} > - > -int proc_get_rf_reg_dump4(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - int len = 0; > - int i, j = 1, path; > - u32 value; > - > - len += snprintf(page + len, count - len, "\n======= RF REG =======\n"); > - path = 2; > - len += snprintf(page + len, count - len, "\nRF_Path(%x)\n", path); > - for (i = 0xC0; i < 0x100; i++) { > - value = rtl8188e_PHY_QueryRFReg(padapter, path, i, 0xffffffff); > - if (j % 4 == 1) > - len += snprintf(page + len, count - len, "0x%02x ", i); > - len += snprintf(page + len, count - len, " 0x%08x ", value); > - if ((j++) % 4 == 0) > - len += snprintf(page + len, count - len, "\n"); > - } > - *eof = 1; > - return len; > -} > - > -int proc_get_rx_signal(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - int len = 0; > - > - len = snprintf(page + len, count, > - "rssi:%d\n" > - "rxpwdb:%d\n" > - "signal_strength:%u\n" > - "signal_qual:%u\n" > - "noise:%u\n", > - padapter->recvpriv.rssi, > - padapter->recvpriv.rxpwdb, > - padapter->recvpriv.signal_strength, > - padapter->recvpriv.signal_qual, > - padapter->recvpriv.noise > - ); > - > - *eof = 1; > - return len; > -} > - > -int proc_set_rx_signal(struct file *file, const char __user *buffer, > - unsigned long count, void *data) > -{ > - struct net_device *dev = (struct net_device *)data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - char tmp[32]; > - u32 is_signal_dbg; > - s32 signal_strength; > - > - if (count < 1) > - return -EFAULT; > - > - if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) { > - int num = sscanf(tmp, "%u %u", &is_signal_dbg, &signal_strength); > - is_signal_dbg = is_signal_dbg == 0 ? 0 : 1; > - if (is_signal_dbg && num != 2) > - return count; > - > - signal_strength = signal_strength > 100 ? 100 : signal_strength; > - signal_strength = signal_strength < 0 ? 0 : signal_strength; > - > - padapter->recvpriv.is_signal_dbg = is_signal_dbg; > - padapter->recvpriv.signal_strength_dbg = signal_strength; > - > - if (is_signal_dbg) > - DBG_88E("set %s %u\n", "DBG_SIGNAL_STRENGTH", signal_strength); > - else > - DBG_88E("set %s\n", "HW_SIGNAL_STRENGTH"); > - } > - return count; > -} > - > -int proc_get_ht_enable(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - struct registry_priv *pregpriv = &padapter->registrypriv; > - int len = 0; > - > - if (pregpriv) > - len += snprintf(page + len, count - len, > - "%d\n", > - pregpriv->ht_enable > - ); > - *eof = 1; > - return len; > -} > - > -int proc_set_ht_enable(struct file *file, const char __user *buffer, > - unsigned long count, void *data) > -{ > - struct net_device *dev = (struct net_device *)data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - struct registry_priv *pregpriv = &padapter->registrypriv; > - char tmp[32]; > - s32 mode = 0; > - > - if (count < 1) > - return -EFAULT; > - > - if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) { > - if (pregpriv) { > - pregpriv->ht_enable = mode; > - pr_info("ht_enable=%d\n", pregpriv->ht_enable); > - } > - } > - > - return count; > -} > - > -int proc_get_cbw40_enable(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - struct registry_priv *pregpriv = &padapter->registrypriv; > - > - int len = 0; > - > - if (pregpriv) > - len += snprintf(page + len, count - len, > - "%d\n", > - pregpriv->cbw40_enable > - ); > - > - *eof = 1; > - return len; > -} > - > -int proc_set_cbw40_enable(struct file *file, const char __user *buffer, > - unsigned long count, void *data) > -{ > - struct net_device *dev = (struct net_device *)data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - struct registry_priv *pregpriv = &padapter->registrypriv; > - char tmp[32]; > - s32 mode = 0; > - > - if (count < 1) > - return -EFAULT; > - > - if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) { > - if (pregpriv) { > - pregpriv->cbw40_enable = mode; > - pr_info("cbw40_enable=%d\n", mode); > - } > - } > - return count; > -} > - > -int proc_get_ampdu_enable(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - struct registry_priv *pregpriv = &padapter->registrypriv; > - > - int len = 0; > - > - if (pregpriv) > - len += snprintf(page + len, count - len, > - "%d\n", > - pregpriv->ampdu_enable > - ); > - > - *eof = 1; > - return len; > -} > - > -int proc_set_ampdu_enable(struct file *file, const char __user *buffer, > - unsigned long count, void *data) > -{ > - struct net_device *dev = (struct net_device *)data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - struct registry_priv *pregpriv = &padapter->registrypriv; > - char tmp[32]; > - s32 mode = 0; > - > - if (count < 1) > - return -EFAULT; > - > - if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) { > - if (pregpriv) { > - pregpriv->ampdu_enable = mode; > - pr_info("ampdu_enable=%d\n", mode); > - } > - } > - return count; > -} > - > -int proc_get_two_path_rssi(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - > - int len = 0; > - > - if (padapter) > - len += snprintf(page + len, count - len, > - "%d %d\n", > - padapter->recvpriv.RxRssi[0], > - padapter->recvpriv.RxRssi[1] > - ); > - > - *eof = 1; > - return len; > -} > - > -int proc_get_rx_stbc(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - struct registry_priv *pregpriv = &padapter->registrypriv; > - > - int len = 0; > - > - if (pregpriv) > - len += snprintf(page + len, count - len, > - "%d\n", > - pregpriv->rx_stbc > - ); > - > - *eof = 1; > - return len; > -} > - > -int proc_set_rx_stbc(struct file *file, const char __user *buffer, > - unsigned long count, void *data) > -{ > - struct net_device *dev = (struct net_device *)data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - struct registry_priv *pregpriv = &padapter->registrypriv; > - char tmp[32]; > - u32 mode = 0; > - > - if (count < 1) > - return -EFAULT; > - > - if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) { > - if (pregpriv) { > - pregpriv->rx_stbc = mode; > - printk("rx_stbc=%d\n", mode); > - } > - } > - return count; > -} > - > -int proc_get_rssi_disp(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - *eof = 1; > - return 0; > -} > - > -int proc_set_rssi_disp(struct file *file, const char __user *buffer, > - unsigned long count, void *data) > -{ > - struct net_device *dev = (struct net_device *)data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - char tmp[32]; > - u32 enable = 0; > - > - if (count < 1) { > - DBG_88E("argument size is less than 1\n"); > - return -EFAULT; > - } > - > - if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) { > - int num = sscanf(tmp, "%x", &enable); > - > - if (num != 1) { > - DBG_88E("invalid set_rssi_disp parameter!\n"); > - return count; > - } > - > - if (enable) { > - DBG_88E("Turn On Rx RSSI Display Function\n"); > - padapter->bRxRSSIDisplay = enable; > - } else { > - DBG_88E("Turn Off Rx RSSI Display Function\n"); > - padapter->bRxRSSIDisplay = 0; > - } > - } > - return count; > -} > - > -int proc_get_all_sta_info(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct sta_info *psta; > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - struct sta_priv *pstapriv = &padapter->stapriv; > - int i, j; > - struct list_head *plist, *phead; > - struct recv_reorder_ctrl *preorder_ctrl; > - int len = 0; > - > - len += snprintf(page + len, count - len, "sta_dz_bitmap=0x%x, tim_bitmap=0x%x\n", pstapriv->sta_dz_bitmap, pstapriv->tim_bitmap); > - > - spin_lock_bh(&pstapriv->sta_hash_lock); > - > - for (i = 0; i < NUM_STA; i++) { > - phead = &pstapriv->sta_hash[i]; > - plist = phead->next; > - > - while (phead != plist) { > - psta = container_of(plist, struct sta_info, hash_list); > - > - plist = plist->next; > - > - len += snprintf(page + len, count - len, "sta's macaddr: %pM\n", psta->hwaddr); > - len += snprintf(page + len, count - len, "rtsen=%d, cts2slef=%d\n", psta->rtsen, psta->cts2self); > - len += snprintf(page + len, count - len, "state=0x%x, aid=%d, macid=%d, raid=%d\n", psta->state, psta->aid, psta->mac_id, psta->raid); > - len += snprintf(page + len, count - len, "qos_en=%d, ht_en=%d, init_rate=%d\n", psta->qos_option, psta->htpriv.ht_option, psta->init_rate); > - len += snprintf(page + len, count - len, "bwmode=%d, ch_offset=%d, sgi=%d\n", psta->htpriv.bwmode, psta->htpriv.ch_offset, psta->htpriv.sgi); > - len += snprintf(page + len, count - len, "ampdu_enable = %d\n", psta->htpriv.ampdu_enable); > - len += snprintf(page + len, count - len, "agg_enable_bitmap=%x, candidate_tid_bitmap=%x\n", psta->htpriv.agg_enable_bitmap, psta->htpriv.candidate_tid_bitmap); > - len += snprintf(page + len, count - len, "sleepq_len=%d\n", psta->sleepq_len); > - len += snprintf(page + len, count - len, "capability=0x%x\n", psta->capability); > - len += snprintf(page + len, count - len, "flags=0x%x\n", psta->flags); > - len += snprintf(page + len, count - len, "wpa_psk=0x%x\n", psta->wpa_psk); > - len += snprintf(page + len, count - len, "wpa2_group_cipher=0x%x\n", psta->wpa2_group_cipher); > - len += snprintf(page + len, count - len, "wpa2_pairwise_cipher=0x%x\n", psta->wpa2_pairwise_cipher); > - len += snprintf(page + len, count - len, "qos_info=0x%x\n", psta->qos_info); > - len += snprintf(page + len, count - len, "dot118021XPrivacy=0x%x\n", psta->dot118021XPrivacy); > - > - for (j = 0; j < 16; j++) { > - preorder_ctrl = &psta->recvreorder_ctrl[j]; > - if (preorder_ctrl->enable) > - len += snprintf(page + len, count - len, "tid=%d, indicate_seq=%d\n", j, preorder_ctrl->indicate_seq); > - } > - } > - } > - spin_unlock_bh(&pstapriv->sta_hash_lock); > - > - *eof = 1; > - return len; > -} > - > -int proc_get_best_channel(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data) > -{ > - struct net_device *dev = data; > - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); > - struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; > - int len = 0; > - u32 i, best_channel_24G = 1, index_24G = 0; > - > - for (i = 0; pmlmeext->channel_set[i].ChannelNum != 0; i++) { > - if (pmlmeext->channel_set[i].ChannelNum == 1) > - index_24G = i; > - } > - > - for (i = 0; pmlmeext->channel_set[i].ChannelNum != 0; i++) { > - /* 2.4G */ > - if (pmlmeext->channel_set[i].ChannelNum == 6) { > - if (pmlmeext->channel_set[i].rx_count < pmlmeext->channel_set[index_24G].rx_count) { > - index_24G = i; > - best_channel_24G = pmlmeext->channel_set[i].ChannelNum; > - } > - } > - > - /* debug */ > - len += snprintf(page + len, count - len, "The rx cnt of channel %3d = %d\n", > - pmlmeext->channel_set[i].ChannelNum, pmlmeext->channel_set[i].rx_count); > - } > - > - len += snprintf(page + len, count - len, "best_channel_24G = %d\n", best_channel_24G); > - > - *eof = 1; > - return len; > -} > diff --git a/drivers/staging/r8188eu/include/rtw_debug.h b/drivers/staging/r8188eu/include/rtw_debug.h > index 002139cacfb5..0a77e3e73a45 100644 > --- a/drivers/staging/r8188eu/include/rtw_debug.h > +++ b/drivers/staging/r8188eu/include/rtw_debug.h > @@ -72,152 +72,4 @@ extern u32 GlobalDebugLevel; > pr_info(DRIVER_PREFIX __VA_ARGS__); \ > } while (0) > > -int proc_get_drv_version(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_get_write_reg(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_set_write_reg(struct file *file, const char __user *buffer, > - unsigned long count, void *data); > -int proc_get_read_reg(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_set_read_reg(struct file *file, const char __user *buffer, > - unsigned long count, void *data); > - > -int proc_get_fwstate(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > -int proc_get_sec_info(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > -int proc_get_mlmext_state(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_get_qos_option(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > -int proc_get_ht_option(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > -int proc_get_rf_info(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > -int proc_get_ap_info(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_get_trx_info(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_get_mac_reg_dump1(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_get_mac_reg_dump2(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_get_mac_reg_dump3(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_get_bb_reg_dump1(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_get_bb_reg_dump2(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_get_bb_reg_dump3(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_get_rf_reg_dump1(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_get_rf_reg_dump2(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_get_rf_reg_dump3(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_get_rf_reg_dump4(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_get_all_sta_info(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_get_best_channel(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_get_rx_signal(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_set_rx_signal(struct file *file, const char __user *buffer, > - unsigned long count, void *data); > - > -int proc_get_ht_enable(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_set_ht_enable(struct file *file, const char __user *buffer, > - unsigned long count, void *data); > - > -int proc_get_cbw40_enable(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_set_cbw40_enable(struct file *file, const char __user *buffer, > - unsigned long count, void *data); > - > -int proc_get_ampdu_enable(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_set_ampdu_enable(struct file *file, const char __user *buffer, > - unsigned long count, void *data); > - > -int proc_get_rx_stbc(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_set_rx_stbc(struct file *file, const char __user *buffer, > - unsigned long count, void *data); > - > -int proc_get_two_path_rssi(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_get_rssi_disp(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_set_rssi_disp(struct file *file, const char __user *buffer, > - unsigned long count, void *data); > - > -#ifdef CONFIG_BT_COEXIST > -int proc_get_btcoex_dbg(char *page, char **start, > - off_t offset, int count, > - int *eof, void *data); > - > -int proc_set_btcoex_dbg(struct file *file, const char *buffer, > - signed long count, void *data); > - > -#endif /* CONFIG_BT_COEXIST */ > - > #endif /* __RTW_DEBUG_H__ */ > Acked-by: Michael Straube