Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp6959941imu; Mon, 3 Dec 2018 05:41:42 -0800 (PST) X-Google-Smtp-Source: AFSGD/UhdtV1STz+lhMs488tOLzPwtqWY8Gm85XnuUKgsKsQ8pVu1f/Lk428VWkfRDloJquUgrL7 X-Received: by 2002:a63:ff62:: with SMTP id s34mr13392685pgk.325.1543844502130; Mon, 03 Dec 2018 05:41:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543844502; cv=none; d=google.com; s=arc-20160816; b=BvLocwD2WOopNzFKPAYKCHhaWQCoJZM8P94W8URKEzEiCzl504lEhwwYzjF/NKHwoR JD/pUoVAK6J1h1vUV26e6t+9i/SdP2vzhpBmFKTPvV7cV1BTW6bSdNM9YPeix+g1n3/t 3sifjLvue6IWSmVF8IjOvosx6xb3dugwK9QFet/loI+YYQ/6LBV6QLUVJ3IknnUg5y4e H+CtaE4gHTS2QII9exQ3VMGHGrjj807LqLAYQsH0wkdIufa3MbSpzXK1fezWKRN81oTq BwvYdnlg0qRaEbYb3OQynNDS2pmV+Z6cs0tG5vevoMLfYkiHHbCTSKr008PRqCcbiFFB wrxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=Qxtg4nICqbh9KhYtdOejhTeV2HFcYiVkS+B7edaqSxc=; b=T4Ti44D7+R3IdSrCFBLlCPs5XJNz3gAUMNGCZZM8HGGIjtaC3Szrt5BexO1DGPEAHh Sr2mR95FoWrTxISj7imrrIQ3gXg3xUK8AwTFv2awxztTSdngEIzUjFf9ceCsXlzVDBll oTYaJKltf4vYrw/tssfq6L2jZruY5tKRbcg4QteTXNmKUBlGMlaW/e1rkG7GByKhWwR+ vr2nBet9/AkQ4+ZBWA/64WX5a7hNsV8qPsLpQzRcDGqfQ3DrRfu+2ewXH0gBWMgcvOUJ VVk+yrXH/zGKhbxjB+jflR4tKQn/F6wECoGlbYdQhrnGx5c5Iwbs/Gjvc/tARXuV6QmA WFNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=SJA71BEC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a6si11067975pgc.137.2018.12.03.05.41.26; Mon, 03 Dec 2018 05:41:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=SJA71BEC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726351AbeLCNlh (ORCPT + 99 others); Mon, 3 Dec 2018 08:41:37 -0500 Received: from mail-pl1-f195.google.com ([209.85.214.195]:40207 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726032AbeLCNlh (ORCPT ); Mon, 3 Dec 2018 08:41:37 -0500 Received: by mail-pl1-f195.google.com with SMTP id u18so6494710plq.7; Mon, 03 Dec 2018 05:40:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Qxtg4nICqbh9KhYtdOejhTeV2HFcYiVkS+B7edaqSxc=; b=SJA71BEC1RzVknAOKHjvq9Q5EKe10rw/Wo+SRs6hZyTEL9j/WbC7ZYmGcrnIAPIKvP oTVewRyFM498vwLBSqHbNXNgFiUpQ9onGaaiqzSTNVN+IBAnLMeGIHbGKIvtH6Pr2FxZ Jt+H3i5RcMGNe/qByF/y1yvVVA7QKVHR4uH/ZHVLz4tXb7fcWsu0Sr2z51nKMHZT/IVn Z/PBkTbLlxf2qtxudYKnCDUhMkuXHo6aQ/FWX+Nxmy0dgVPbm0DL/1FQefaRDxkEDOJw n7m2qi38kOmkOQjddz8Z3Ry5GIRk4ToOQSzy1evRFId1AV9yBaZdfL10CDH16u5yM1mt Vx+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Qxtg4nICqbh9KhYtdOejhTeV2HFcYiVkS+B7edaqSxc=; b=KOKHNJ6C8cFqlsBT+OG/Z2wRRYgOzZtHLeib58BkfQsJ8hD0QB9BPCTk7QfcKY9/tg lqNDMXSMbMfoT0oQ7LixMrAb4sHDNR2rAWATBpwaK/E8RZelXi6OBJzCXAlMnORRQ2L1 Bl+dooXCWkqCEDh+vhz04b1EsVek6yu2vjJcNAtB4TQpamv3AqIcZD4O8/uVqQQS+xs2 qppmBOCotxnLptAmTfr0zQPwjTCc/7XaDbxs8Nym8cP44mCxWSEVjOMThvwPdgNu/wS1 vsJycvdwn/+v9FYWwHK6GkS/dNtFVpU4wXL+TDcdeQ0a/Qe8HhFW/YOq3IyyU6ss8kxr DJ4A== X-Gm-Message-State: AA+aEWYz/QCvLVp9GOqq2ZHkoah9UCEYwIdjWhvBDwBYNPO9vNa8ueRp uIAltiXBFNahijpJ8TSr9GM= X-Received: by 2002:a17:902:27e6:: with SMTP id i35mr15701908plg.222.1543844432477; Mon, 03 Dec 2018 05:40:32 -0800 (PST) Received: from localhost (68.168.130.77.16clouds.com. [68.168.130.77]) by smtp.gmail.com with ESMTPSA id u78sm31132346pfi.2.2018.12.03.05.40.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Dec 2018 05:40:31 -0800 (PST) From: Yangtao Li To: davem@davemloft.net, kubakici@wp.pl, matthias.bgg@gmail.com, nbd@nbd.name, lorenzo.bianconi@redhat.com, joe@perches.com, sgruszka@redhat.com, kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Yangtao Li Subject: [PATCH] mt76: convert to DEFINE_SHOW_ATTRIBUTE Date: Mon, 3 Dec 2018 08:40:28 -0500 Message-Id: <20181203134028.12645-1-tiny.windzz@gmail.com> X-Mailer: git-send-email 2.17.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use DEFINE_SHOW_ATTRIBUTE macro to simplify the code. Signed-off-by: Yangtao Li --- .../wireless/mediatek/mt76/mt76x0/debugfs.c | 20 ++-------- .../wireless/mediatek/mt76/mt76x2/debugfs.c | 38 +++--------------- .../net/wireless/mediatek/mt7601u/debugfs.c | 40 ++++--------------- 3 files changed, 18 insertions(+), 80 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt76x0/debugfs.c index 3224e5b1a1e5..21fde45b1b20 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x0/debugfs.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/debugfs.c @@ -18,8 +18,7 @@ #include "mt76x0.h" #include "eeprom.h" -static int -mt76x0_ampdu_stat_read(struct seq_file *file, void *data) +static int ampdu_stat_show(struct seq_file *file, void *data) { struct mt76x02_dev *dev = file->private; int i, j; @@ -61,19 +60,7 @@ mt76x0_ampdu_stat_read(struct seq_file *file, void *data) return 0; } - -static int -mt76x0_ampdu_stat_open(struct inode *inode, struct file *f) -{ - return single_open(f, mt76x0_ampdu_stat_read, inode->i_private); -} - -static const struct file_operations fops_ampdu_stat = { - .open = mt76x0_ampdu_stat_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE(ampdu_stat); void mt76x0_init_debugfs(struct mt76x02_dev *dev) { @@ -83,5 +70,6 @@ void mt76x0_init_debugfs(struct mt76x02_dev *dev) if (!dir) return; - debugfs_create_file("ampdu_stat", S_IRUSR, dir, dev, &fops_ampdu_stat); + debugfs_create_file("ampdu_stat", S_IRUSR, dir, dev, + &du_stat_fops); } diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt76x2/debugfs.c index e8f8ccc0a5ed..04711cd09d21 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x2/debugfs.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x2/debugfs.c @@ -17,8 +17,7 @@ #include #include "mt76x2.h" -static int -mt76x2_ampdu_stat_read(struct seq_file *file, void *data) +static int ampdu_stat_show(struct seq_file *file, void *data) { struct mt76x02_dev *dev = file->private; int i, j; @@ -40,12 +39,7 @@ mt76x2_ampdu_stat_read(struct seq_file *file, void *data) return 0; } - -static int -mt76x2_ampdu_stat_open(struct inode *inode, struct file *f) -{ - return single_open(f, mt76x2_ampdu_stat_read, inode->i_private); -} +DEFINE_SHOW_ATTRIBUTE(ampdu_stat); static int read_txpower(struct seq_file *file, void *data) { @@ -58,15 +52,7 @@ static int read_txpower(struct seq_file *file, void *data) return 0; } -static const struct file_operations fops_ampdu_stat = { - .open = mt76x2_ampdu_stat_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; - -static int -mt76x2_dfs_stat_read(struct seq_file *file, void *data) +static int dfs_stat_show(struct seq_file *file, void *data) { struct mt76x02_dev *dev = file->private; struct mt76x02_dfs_pattern_detector *dfs_pd = &dev->dfs_pd; @@ -90,19 +76,7 @@ mt76x2_dfs_stat_read(struct seq_file *file, void *data) return 0; } - -static int -mt76x2_dfs_stat_open(struct inode *inode, struct file *f) -{ - return single_open(f, mt76x2_dfs_stat_read, inode->i_private); -} - -static const struct file_operations fops_dfs_stat = { - .open = mt76x2_dfs_stat_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE(dfs_stat); static int read_agc(struct seq_file *file, void *data) { @@ -127,8 +101,8 @@ void mt76x2_init_debugfs(struct mt76x02_dev *dev) debugfs_create_u8("temperature", 0400, dir, &dev->cal.temp); debugfs_create_bool("tpc", 0600, dir, &dev->enable_tpc); - debugfs_create_file("ampdu_stat", 0400, dir, dev, &fops_ampdu_stat); - debugfs_create_file("dfs_stats", 0400, dir, dev, &fops_dfs_stat); + debugfs_create_file("ampdu_stat", 0400, dir, dev, &du_stat_fops); + debugfs_create_file("dfs_stats", 0400, dir, dev, &dfs_stat_fops); debugfs_create_devm_seqfile(dev->mt76.dev, "txpower", dir, read_txpower); diff --git a/drivers/net/wireless/mediatek/mt7601u/debugfs.c b/drivers/net/wireless/mediatek/mt7601u/debugfs.c index 991a6a729b1e..0be3084fee01 100644 --- a/drivers/net/wireless/mediatek/mt7601u/debugfs.c +++ b/drivers/net/wireless/mediatek/mt7601u/debugfs.c @@ -37,8 +37,7 @@ mt76_reg_get(void *data, u64 *val) DEFINE_SIMPLE_ATTRIBUTE(fops_regval, mt76_reg_get, mt76_reg_set, "0x%08llx\n"); -static int -mt7601u_ampdu_stat_read(struct seq_file *file, void *data) +static int ampdu_stat_show(struct seq_file *file, void *data) { struct mt7601u_dev *dev = file->private; int i, j; @@ -80,22 +79,9 @@ mt7601u_ampdu_stat_read(struct seq_file *file, void *data) return 0; } +DEFINE_SHOW_ATTRIBUTE(ampdu_stat); -static int -mt7601u_ampdu_stat_open(struct inode *inode, struct file *f) -{ - return single_open(f, mt7601u_ampdu_stat_read, inode->i_private); -} - -static const struct file_operations fops_ampdu_stat = { - .open = mt7601u_ampdu_stat_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; - -static int -mt7601u_eeprom_param_read(struct seq_file *file, void *data) +static int eeprom_param_show(struct seq_file *file, void *data) { struct mt7601u_dev *dev = file->private; struct mt7601u_rate_power *rp = &dev->ee->power_rate_table; @@ -138,19 +124,7 @@ mt7601u_eeprom_param_read(struct seq_file *file, void *data) return 0; } - -static int -mt7601u_eeprom_param_open(struct inode *inode, struct file *f) -{ - return single_open(f, mt7601u_eeprom_param_read, inode->i_private); -} - -static const struct file_operations fops_eeprom_param = { - .open = mt7601u_eeprom_param_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE(eeprom_param); void mt7601u_init_debugfs(struct mt7601u_dev *dev) { @@ -165,6 +139,8 @@ void mt7601u_init_debugfs(struct mt7601u_dev *dev) debugfs_create_u32("regidx", 0600, dir, &dev->debugfs_reg); debugfs_create_file("regval", 0600, dir, dev, &fops_regval); - debugfs_create_file("ampdu_stat", 0400, dir, dev, &fops_ampdu_stat); - debugfs_create_file("eeprom_param", 0400, dir, dev, &fops_eeprom_param); + debugfs_create_file("ampdu_stat", 0400, dir, dev, + &du_stat_fops); + debugfs_create_file("eeprom_param", 0400, dir, dev, + &eeprom_param_fops); } -- 2.17.0